From 68ebdaacef15112748e339d269bf084a8f711e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20K=C5=82obuszewski?= Date: Wed, 26 Sep 2018 17:08:11 +0200 Subject: [PATCH] Fix Stackdriver custom metrics tests They were broken probably by https://github.com/kubernetes/kubernetes/pull/68015 that introduced a REST mapper which doesn't contain a mapping for Pod resource, yet the test is depending on it. --- test/e2e/instrumentation/monitoring/BUILD | 4 ++-- .../monitoring/custom_metrics_stackdriver.go | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/test/e2e/instrumentation/monitoring/BUILD b/test/e2e/instrumentation/monitoring/BUILD index 8f647a964c3..94327d8f934 100644 --- a/test/e2e/instrumentation/monitoring/BUILD +++ b/test/e2e/instrumentation/monitoring/BUILD @@ -22,7 +22,6 @@ go_library( "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", @@ -30,8 +29,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/selection:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", + "//staging/src/k8s.io/client-go/discovery/cached:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", - "//staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1:go_default_library", + "//staging/src/k8s.io/client-go/restmapper:go_default_library", "//staging/src/k8s.io/metrics/pkg/client/custom_metrics:go_default_library", "//staging/src/k8s.io/metrics/pkg/client/external_metrics:go_default_library", "//test/e2e/common:go_default_library", diff --git a/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go b/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go index 36bed14bc69..9c77aa43a40 100644 --- a/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go +++ b/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go @@ -29,13 +29,13 @@ import ( gcm "google.golang.org/api/monitoring/v3" "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/selection" "k8s.io/client-go/discovery" + cacheddiscovery "k8s.io/client-go/discovery/cached" + "k8s.io/client-go/restmapper" "k8s.io/kubernetes/test/e2e/framework" - cmv1beta1 "k8s.io/metrics/pkg/apis/custom_metrics/v1beta1" customclient "k8s.io/metrics/pkg/client/custom_metrics" externalclient "k8s.io/metrics/pkg/client/external_metrics" ) @@ -60,8 +60,10 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() { framework.Failf("Failed to load config: %s", err) } discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config) + cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoveryClient) + restMapper := restmapper.NewDeferredDiscoveryRESTMapper(cachedDiscoClient) + restMapper.Reset() apiVersionsGetter := customclient.NewAvailableAPIsGetter(discoveryClient) - restMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{cmv1beta1.SchemeGroupVersion}) customMetricsClient := customclient.NewForConfig(config, restMapper, apiVersionsGetter) testCustomMetrics(f, kubeClient, customMetricsClient, discoveryClient, AdapterForOldResourceModel) }) @@ -73,8 +75,10 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() { framework.Failf("Failed to load config: %s", err) } discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config) + cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoveryClient) + restMapper := restmapper.NewDeferredDiscoveryRESTMapper(cachedDiscoClient) + restMapper.Reset() apiVersionsGetter := customclient.NewAvailableAPIsGetter(discoveryClient) - restMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{cmv1beta1.SchemeGroupVersion}) customMetricsClient := customclient.NewForConfig(config, restMapper, apiVersionsGetter) testCustomMetrics(f, kubeClient, customMetricsClient, discoveryClient, AdapterForNewResourceModel) })