From 101221be339e6cc37302a7a7713834d5f8dd8ce1 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Tue, 7 Apr 2020 16:20:07 +0200 Subject: [PATCH] Stop relying on default conversion in node e2e tests --- test/e2e/framework/kubelet/BUILD | 2 +- test/e2e/framework/kubelet/config.go | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/kubelet/BUILD b/test/e2e/framework/kubelet/BUILD index 5cc3ba24a46..90177da2328 100644 --- a/test/e2e/framework/kubelet/BUILD +++ b/test/e2e/framework/kubelet/BUILD @@ -11,13 +11,13 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", "//test/e2e/framework:go_default_library", diff --git a/test/e2e/framework/kubelet/config.go b/test/e2e/framework/kubelet/config.go index aec945f01af..962c0743a8b 100644 --- a/test/e2e/framework/kubelet/config.go +++ b/test/e2e/framework/kubelet/config.go @@ -27,9 +27,9 @@ import ( "time" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/kubernetes/scheme" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" "k8s.io/kubernetes/test/e2e/framework" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" @@ -123,7 +123,11 @@ func decodeConfigz(resp *http.Response) (*kubeletconfig.KubeletConfiguration, er return nil, err } - err = scheme.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) + scheme, _, err := kubeletconfigscheme.NewSchemeAndCodecs() + if err != nil { + return nil, err + } + err = scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) if err != nil { return nil, err }