From ccded1494116d6aa1ac3f4612b4a613b56a2044a Mon Sep 17 00:00:00 2001 From: wojtekt Date: Wed, 6 Nov 2019 14:02:27 +0100 Subject: [PATCH] Eliminate some default conversions --- pkg/controller/cronjob/BUILD | 1 - pkg/controller/cronjob/utils.go | 5 +---- .../k8s.io/apiserver/pkg/endpoints/handlers/response.go | 2 +- test/e2e_node/BUILD | 2 +- test/e2e_node/util.go | 9 +++++++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/controller/cronjob/BUILD b/pkg/controller/cronjob/BUILD index 6c5af9982d5..cd862f073b8 100644 --- a/pkg/controller/cronjob/BUILD +++ b/pkg/controller/cronjob/BUILD @@ -16,7 +16,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/controller/cronjob", deps = [ - "//pkg/api/legacyscheme:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/controller/cronjob/utils.go b/pkg/controller/cronjob/utils.go index 84876c6d334..862a5fb2396 100644 --- a/pkg/controller/cronjob/utils.go +++ b/pkg/controller/cronjob/utils.go @@ -28,7 +28,6 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/api/legacyscheme" ) // Utilities for dealing with Jobs and CronJobs and time. @@ -163,9 +162,7 @@ func getJobFromTemplate(sj *batchv1beta1.CronJob, scheduledTime time.Time) (*bat OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(sj, controllerKind)}, }, } - if err := legacyscheme.Scheme.Convert(&sj.Spec.JobTemplate.Spec, &job.Spec, nil); err != nil { - return nil, fmt.Errorf("unable to convert job template: %v", err) - } + sj.Spec.JobTemplate.Spec.DeepCopyInto(&job.Spec) return job, nil } diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go index d2782178fd7..6a13a8d5ec9 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go @@ -94,7 +94,7 @@ func optionsForTransform(mediaType negotiation.MediaTypeOptions, req *http.Reque case target == nil: case target.Kind == "Table" && (target.GroupVersion() == metav1beta1.SchemeGroupVersion || target.GroupVersion() == metav1.SchemeGroupVersion): opts := &metav1beta1.TableOptions{} - if err := metav1beta1.ParameterCodec.DecodeParameters(req.URL.Query(), metav1beta1.SchemeGroupVersion, opts); err != nil { + if err := metainternalversionscheme.ParameterCodec.DecodeParameters(req.URL.Query(), metav1beta1.SchemeGroupVersion, opts); err != nil { return nil, err } switch errs := validation.ValidateTableOptions(opts); len(errs) { diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index ebe67665456..f7854cb74b8 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -25,6 +25,7 @@ go_library( deps = [ "//pkg/features:go_default_library", "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", "//pkg/kubelet/apis/podresources:go_default_library", "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", @@ -39,7 +40,6 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature: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/component-base/featuregate:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 8d93022513a..a48ab25895e 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -35,13 +35,13 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/kubernetes/scheme" "k8s.io/component-base/featuregate" internalapi "k8s.io/cri-api/pkg/apis" "k8s.io/klog" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" "k8s.io/kubernetes/pkg/features" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" kubeletpodresourcesv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" kubeletstatsv1alpha1 "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" @@ -288,6 +288,11 @@ func decodeConfigz(resp *http.Response) (*kubeletconfig.KubeletConfiguration, er ComponentConfig kubeletconfigv1beta1.KubeletConfiguration `json:"kubeletconfig"` } + scheme, _, err := kubeletscheme.NewSchemeAndCodecs() + if err != nil { + return nil, err + } + configz := configzWrapper{} kubeCfg := kubeletconfig.KubeletConfiguration{} @@ -301,7 +306,7 @@ func decodeConfigz(resp *http.Response) (*kubeletconfig.KubeletConfiguration, er return nil, err } - err = scheme.Scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) + err = scheme.Convert(&configz.ComponentConfig, &kubeCfg, nil) if err != nil { return nil, err }