From 62bfe29ce49c13269e525c50b29d65c74694ad59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 29 Aug 2018 18:59:05 +0300 Subject: [PATCH 1/4] automated, boring: Rename pkg/kubelet/apis/{kubelet,}config --- pkg/kubelet/apis/{kubeletconfig => config}/BUILD | 0 pkg/kubelet/apis/{kubeletconfig => config}/OWNERS | 0 pkg/kubelet/apis/{kubeletconfig => config}/doc.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/fuzzer/BUILD | 0 pkg/kubelet/apis/{kubeletconfig => config}/fuzzer/fuzzer.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/helpers.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/helpers_test.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/register.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/scheme/BUILD | 0 pkg/kubelet/apis/{kubeletconfig => config}/scheme/scheme.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/scheme/scheme_test.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/types.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/BUILD | 0 pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/defaults.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/doc.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/register.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/types.go | 0 .../{kubeletconfig => config}/v1beta1/zz_generated.conversion.go | 0 .../{kubeletconfig => config}/v1beta1/zz_generated.deepcopy.go | 0 .../{kubeletconfig => config}/v1beta1/zz_generated.defaults.go | 0 pkg/kubelet/apis/{kubeletconfig => config}/validation/BUILD | 0 .../apis/{kubeletconfig => config}/validation/validation.go | 0 .../{kubeletconfig => config}/validation/validation_others.go | 0 .../apis/{kubeletconfig => config}/validation/validation_test.go | 0 .../{kubeletconfig => config}/validation/validation_windows.go | 0 .../apis/{kubeletconfig => config}/zz_generated.deepcopy.go | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename pkg/kubelet/apis/{kubeletconfig => config}/BUILD (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/OWNERS (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/doc.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/fuzzer/BUILD (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/fuzzer/fuzzer.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/helpers.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/helpers_test.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/register.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/scheme/BUILD (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/scheme/scheme.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/scheme/scheme_test.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/types.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/BUILD (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/defaults.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/doc.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/register.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/types.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/zz_generated.conversion.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/zz_generated.deepcopy.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/v1beta1/zz_generated.defaults.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/validation/BUILD (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/validation/validation.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/validation/validation_others.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/validation/validation_test.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/validation/validation_windows.go (100%) rename pkg/kubelet/apis/{kubeletconfig => config}/zz_generated.deepcopy.go (100%) diff --git a/pkg/kubelet/apis/kubeletconfig/BUILD b/pkg/kubelet/apis/config/BUILD similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/BUILD rename to pkg/kubelet/apis/config/BUILD diff --git a/pkg/kubelet/apis/kubeletconfig/OWNERS b/pkg/kubelet/apis/config/OWNERS similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/OWNERS rename to pkg/kubelet/apis/config/OWNERS diff --git a/pkg/kubelet/apis/kubeletconfig/doc.go b/pkg/kubelet/apis/config/doc.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/doc.go rename to pkg/kubelet/apis/config/doc.go diff --git a/pkg/kubelet/apis/kubeletconfig/fuzzer/BUILD b/pkg/kubelet/apis/config/fuzzer/BUILD similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/fuzzer/BUILD rename to pkg/kubelet/apis/config/fuzzer/BUILD diff --git a/pkg/kubelet/apis/kubeletconfig/fuzzer/fuzzer.go b/pkg/kubelet/apis/config/fuzzer/fuzzer.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/fuzzer/fuzzer.go rename to pkg/kubelet/apis/config/fuzzer/fuzzer.go diff --git a/pkg/kubelet/apis/kubeletconfig/helpers.go b/pkg/kubelet/apis/config/helpers.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/helpers.go rename to pkg/kubelet/apis/config/helpers.go diff --git a/pkg/kubelet/apis/kubeletconfig/helpers_test.go b/pkg/kubelet/apis/config/helpers_test.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/helpers_test.go rename to pkg/kubelet/apis/config/helpers_test.go diff --git a/pkg/kubelet/apis/kubeletconfig/register.go b/pkg/kubelet/apis/config/register.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/register.go rename to pkg/kubelet/apis/config/register.go diff --git a/pkg/kubelet/apis/kubeletconfig/scheme/BUILD b/pkg/kubelet/apis/config/scheme/BUILD similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/scheme/BUILD rename to pkg/kubelet/apis/config/scheme/BUILD diff --git a/pkg/kubelet/apis/kubeletconfig/scheme/scheme.go b/pkg/kubelet/apis/config/scheme/scheme.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/scheme/scheme.go rename to pkg/kubelet/apis/config/scheme/scheme.go diff --git a/pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go b/pkg/kubelet/apis/config/scheme/scheme_test.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/scheme/scheme_test.go rename to pkg/kubelet/apis/config/scheme/scheme_test.go diff --git a/pkg/kubelet/apis/kubeletconfig/types.go b/pkg/kubelet/apis/config/types.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/types.go rename to pkg/kubelet/apis/config/types.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD b/pkg/kubelet/apis/config/v1beta1/BUILD similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/BUILD rename to pkg/kubelet/apis/config/v1beta1/BUILD diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go b/pkg/kubelet/apis/config/v1beta1/defaults.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/defaults.go rename to pkg/kubelet/apis/config/v1beta1/defaults.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/doc.go b/pkg/kubelet/apis/config/v1beta1/doc.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/doc.go rename to pkg/kubelet/apis/config/v1beta1/doc.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/register.go b/pkg/kubelet/apis/config/v1beta1/register.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/register.go rename to pkg/kubelet/apis/config/v1beta1/register.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go b/pkg/kubelet/apis/config/v1beta1/types.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/types.go rename to pkg/kubelet/apis/config/v1beta1/types.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/zz_generated.conversion.go b/pkg/kubelet/apis/config/v1beta1/zz_generated.conversion.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/zz_generated.conversion.go rename to pkg/kubelet/apis/config/v1beta1/zz_generated.conversion.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/zz_generated.deepcopy.go b/pkg/kubelet/apis/config/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/zz_generated.deepcopy.go rename to pkg/kubelet/apis/config/v1beta1/zz_generated.deepcopy.go diff --git a/pkg/kubelet/apis/kubeletconfig/v1beta1/zz_generated.defaults.go b/pkg/kubelet/apis/config/v1beta1/zz_generated.defaults.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/v1beta1/zz_generated.defaults.go rename to pkg/kubelet/apis/config/v1beta1/zz_generated.defaults.go diff --git a/pkg/kubelet/apis/kubeletconfig/validation/BUILD b/pkg/kubelet/apis/config/validation/BUILD similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/validation/BUILD rename to pkg/kubelet/apis/config/validation/BUILD diff --git a/pkg/kubelet/apis/kubeletconfig/validation/validation.go b/pkg/kubelet/apis/config/validation/validation.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/validation/validation.go rename to pkg/kubelet/apis/config/validation/validation.go diff --git a/pkg/kubelet/apis/kubeletconfig/validation/validation_others.go b/pkg/kubelet/apis/config/validation/validation_others.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/validation/validation_others.go rename to pkg/kubelet/apis/config/validation/validation_others.go diff --git a/pkg/kubelet/apis/kubeletconfig/validation/validation_test.go b/pkg/kubelet/apis/config/validation/validation_test.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/validation/validation_test.go rename to pkg/kubelet/apis/config/validation/validation_test.go diff --git a/pkg/kubelet/apis/kubeletconfig/validation/validation_windows.go b/pkg/kubelet/apis/config/validation/validation_windows.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/validation/validation_windows.go rename to pkg/kubelet/apis/config/validation/validation_windows.go diff --git a/pkg/kubelet/apis/kubeletconfig/zz_generated.deepcopy.go b/pkg/kubelet/apis/config/zz_generated.deepcopy.go similarity index 100% rename from pkg/kubelet/apis/kubeletconfig/zz_generated.deepcopy.go rename to pkg/kubelet/apis/config/zz_generated.deepcopy.go From 7a840cb4c8ff1936fc3196348c3fb7a1898f5bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 29 Aug 2018 19:07:52 +0300 Subject: [PATCH 2/4] automated: Rename all package references --- cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go | 4 +- cmd/kubeadm/app/apis/kubeadm/types.go | 2 +- .../app/apis/kubeadm/v1alpha2/conversion.go | 4 +- .../app/apis/kubeadm/v1alpha2/defaults.go | 4 +- .../app/apis/kubeadm/v1alpha2/types.go | 2 +- .../kubeadm/v1alpha2/zz_generated.deepcopy.go | 2 +- .../kubeadm/v1alpha2/zz_generated.defaults.go | 2 +- .../app/apis/kubeadm/v1alpha3/conversion.go | 6 +- .../app/apis/kubeadm/zz_generated.deepcopy.go | 8 +- cmd/kubeadm/app/componentconfigs/defaults.go | 4 +- .../app/componentconfigs/registrations.go | 4 +- .../app/componentconfigs/validation.go | 2 +- .../app/componentconfigs/validation_test.go | 2 +- cmd/kubeadm/app/phases/kubelet/config.go | 2 +- cmd/kubeadm/app/phases/kubelet/config_test.go | 2 +- cmd/kubelet/app/auth.go | 2 +- cmd/kubelet/app/options/options.go | 8 +- cmd/kubelet/app/server.go | 8 +- pkg/kubelet/apis/config/doc.go | 2 +- pkg/kubelet/apis/config/fuzzer/fuzzer.go | 4 +- pkg/kubelet/apis/config/helpers.go | 2 +- pkg/kubelet/apis/config/helpers_test.go | 2 +- pkg/kubelet/apis/config/register.go | 2 +- pkg/kubelet/apis/config/scheme/scheme.go | 4 +- pkg/kubelet/apis/config/scheme/scheme_test.go | 2 +- pkg/kubelet/apis/config/types.go | 2 +- pkg/kubelet/apis/config/v1beta1/doc.go | 4 +- .../config/v1beta1/zz_generated.conversion.go | 222 +++++++++--------- .../apis/config/validation/validation.go | 2 +- .../config/validation/validation_others.go | 2 +- .../apis/config/validation/validation_test.go | 2 +- .../config/validation/validation_windows.go | 2 +- .../apis/config/zz_generated.deepcopy.go | 2 +- pkg/kubelet/certificate/kubelet.go | 2 +- pkg/kubelet/dockershim/docker_service.go | 2 +- pkg/kubelet/dockershim/network/cni/cni.go | 2 +- .../dockershim/network/cni/cni_test.go | 2 +- .../network/kubenet/kubenet_linux.go | 2 +- .../network/kubenet/kubenet_linux_test.go | 2 +- .../network/kubenet/kubenet_unsupported.go | 2 +- pkg/kubelet/dockershim/network/plugins.go | 2 +- .../network/testing/mock_network_plugin.go | 2 +- .../network/testing/plugins_test.go | 2 +- pkg/kubelet/kubelet.go | 2 +- .../kubeletconfig/checkpoint/download.go | 6 +- .../checkpoint/store/fakestore.go | 2 +- .../kubeletconfig/checkpoint/store/fsstore.go | 2 +- .../checkpoint/store/fsstore_test.go | 6 +- .../kubeletconfig/checkpoint/store/store.go | 2 +- .../kubeletconfig/configfiles/configfiles.go | 4 +- .../configfiles/configfiles_test.go | 6 +- pkg/kubelet/kubeletconfig/controller.go | 4 +- pkg/kubelet/kubeletconfig/util/codec/codec.go | 4 +- pkg/kubemark/hollow_kubelet.go | 2 +- test/e2e/framework/test_context.go | 2 +- test/e2e_node/container_log_rotation_test.go | 2 +- test/e2e_node/cpu_manager_test.go | 2 +- test/e2e_node/critical_pod_test.go | 2 +- test/e2e_node/density_test.go | 2 +- test/e2e_node/device_plugin.go | 2 +- test/e2e_node/dynamic_kubelet_config_test.go | 2 +- test/e2e_node/eviction_test.go | 2 +- test/e2e_node/hugepages_test.go | 2 +- test/e2e_node/node_container_manager_test.go | 2 +- test/e2e_node/services/kubelet.go | 4 +- test/e2e_node/util.go | 4 +- 66 files changed, 206 insertions(+), 206 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go index 8577d8a5589..bbc7a6ebe4c 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go @@ -27,8 +27,8 @@ import ( kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" utilpointer "k8s.io/utils/pointer" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index d43e70b24da..9ca3e404225 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/conversion.go index e04af66dadb..da4de701853 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/conversion.go @@ -23,8 +23,8 @@ import ( kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go index 21d414001a4..b092400f695 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/defaults.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeproxyscheme "k8s.io/kubernetes/pkg/proxy/apis/config/scheme" utilpointer "k8s.io/utils/pointer" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/types.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/types.go index b198cc6ed73..392c579a9c9 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/types.go @@ -20,7 +20,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.deepcopy.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.deepcopy.go index da5b52b32ae..eda283bd5cf 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.deepcopy.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" v1alpha1 "k8s.io/kube-proxy/config/v1alpha1" - v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.defaults.go index 0cd3e695cf2..dd4522ee412 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/zz_generated.defaults.go @@ -22,7 +22,7 @@ package v1alpha2 import ( runtime "k8s.io/apimachinery/pkg/runtime" - v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + v1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" v1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/conversion.go index a7965dbd4a2..ad8122243eb 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/conversion.go @@ -21,9 +21,9 @@ import ( kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" kubeproxyconfigscheme "k8s.io/kubernetes/pkg/proxy/apis/config/scheme" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go b/cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go index 160f1ce9eee..310e205f241 100644 --- a/cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go +++ b/cmd/kubeadm/app/apis/kubeadm/zz_generated.deepcopy.go @@ -24,8 +24,8 @@ import ( corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - config "k8s.io/kubernetes/pkg/proxy/apis/config" + config "k8s.io/kubernetes/pkg/kubelet/apis/config" + apisconfig "k8s.io/kubernetes/pkg/proxy/apis/config" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. @@ -235,12 +235,12 @@ func (in *ComponentConfigs) DeepCopyInto(out *ComponentConfigs) { *out = *in if in.Kubelet != nil { in, out := &in.Kubelet, &out.Kubelet - *out = new(kubeletconfig.KubeletConfiguration) + *out = new(config.KubeletConfiguration) (*in).DeepCopyInto(*out) } if in.KubeProxy != nil { in, out := &in.KubeProxy, &out.KubeProxy - *out = new(config.KubeProxyConfiguration) + *out = new(apisconfig.KubeProxyConfiguration) (*in).DeepCopyInto(*out) } return diff --git a/cmd/kubeadm/app/componentconfigs/defaults.go b/cmd/kubeadm/app/componentconfigs/defaults.go index bf22b4e2177..4b3e15b8577 100644 --- a/cmd/kubeadm/app/componentconfigs/defaults.go +++ b/cmd/kubeadm/app/componentconfigs/defaults.go @@ -21,8 +21,8 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1" utilpointer "k8s.io/utils/pointer" diff --git a/cmd/kubeadm/app/componentconfigs/registrations.go b/cmd/kubeadm/app/componentconfigs/registrations.go index 7a506f47262..bae83ac4356 100644 --- a/cmd/kubeadm/app/componentconfigs/registrations.go +++ b/cmd/kubeadm/app/componentconfigs/registrations.go @@ -23,8 +23,8 @@ import ( kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" ) diff --git a/cmd/kubeadm/app/componentconfigs/validation.go b/cmd/kubeadm/app/componentconfigs/validation.go index 3cf65453358..ad606edfa68 100644 --- a/cmd/kubeadm/app/componentconfigs/validation.go +++ b/cmd/kubeadm/app/componentconfigs/validation.go @@ -19,7 +19,7 @@ package componentconfigs import ( "k8s.io/apimachinery/pkg/util/validation/field" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeletvalidation "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/validation" + kubeletvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" proxyvalidation "k8s.io/kubernetes/pkg/proxy/apis/config/validation" ) diff --git a/cmd/kubeadm/app/componentconfigs/validation_test.go b/cmd/kubeadm/app/componentconfigs/validation_test.go index 39d1f9d1662..0881f2db9fe 100644 --- a/cmd/kubeadm/app/componentconfigs/validation_test.go +++ b/cmd/kubeadm/app/componentconfigs/validation_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" utilpointer "k8s.io/utils/pointer" ) diff --git a/cmd/kubeadm/app/phases/kubelet/config.go b/cmd/kubeadm/app/phases/kubelet/config.go index 63d8a7c6bab..be0d85bee6a 100644 --- a/cmd/kubeadm/app/phases/kubelet/config.go +++ b/cmd/kubeadm/app/phases/kubelet/config.go @@ -32,7 +32,7 @@ import ( kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/util/version" ) diff --git a/cmd/kubeadm/app/phases/kubelet/config_test.go b/cmd/kubeadm/app/phases/kubelet/config_test.go index 697fcd61da7..db6d55393c9 100644 --- a/cmd/kubeadm/app/phases/kubelet/config_test.go +++ b/cmd/kubeadm/app/phases/kubelet/config_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/util/version" ) diff --git a/cmd/kubelet/app/auth.go b/cmd/kubelet/app/auth.go index 6d70f810b59..14cb0da3e33 100644 --- a/cmd/kubelet/app/auth.go +++ b/cmd/kubelet/app/auth.go @@ -30,7 +30,7 @@ import ( authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/server" ) diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 0e9e478f97a..d06e978d813 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -32,10 +32,10 @@ import ( "k8s.io/kubernetes/pkg/apis/componentconfig" "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" - kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/validation" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" + kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" "k8s.io/kubernetes/pkg/kubelet/config" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/master/ports" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index b07fe3e2393..945957d9073 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -64,10 +64,10 @@ import ( "k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet" - kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" - kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/validation" + kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" + kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubeletcertificate "k8s.io/kubernetes/pkg/kubelet/certificate" "k8s.io/kubernetes/pkg/kubelet/certificate/bootstrap" diff --git a/pkg/kubelet/apis/config/doc.go b/pkg/kubelet/apis/config/doc.go index bd856d83117..c58ee77879e 100644 --- a/pkg/kubelet/apis/config/doc.go +++ b/pkg/kubelet/apis/config/doc.go @@ -16,4 +16,4 @@ limitations under the License. // +k8s:deepcopy-gen=package -package kubeletconfig // import "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" +package config // import "k8s.io/kubernetes/pkg/kubelet/apis/config" diff --git a/pkg/kubelet/apis/config/fuzzer/fuzzer.go b/pkg/kubelet/apis/config/fuzzer/fuzzer.go index 6b2a7b5ef27..c57c2250d10 100644 --- a/pkg/kubelet/apis/config/fuzzer/fuzzer.go +++ b/pkg/kubelet/apis/config/fuzzer/fuzzer.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/master/ports" diff --git a/pkg/kubelet/apis/config/helpers.go b/pkg/kubelet/apis/config/helpers.go index 3563fb7fd9e..0217fadb616 100644 --- a/pkg/kubelet/apis/config/helpers.go +++ b/pkg/kubelet/apis/config/helpers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kubeletconfig +package config // KubeletConfigurationPathRefs returns pointers to all of the KubeletConfiguration fields that contain filepaths. // You might use this, for example, to resolve all relative paths against some common root before diff --git a/pkg/kubelet/apis/config/helpers_test.go b/pkg/kubelet/apis/config/helpers_test.go index 7af76b5f726..1421f106b01 100644 --- a/pkg/kubelet/apis/config/helpers_test.go +++ b/pkg/kubelet/apis/config/helpers_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kubeletconfig +package config import ( "reflect" diff --git a/pkg/kubelet/apis/config/register.go b/pkg/kubelet/apis/config/register.go index 886f39dec4b..450e5802fbf 100644 --- a/pkg/kubelet/apis/config/register.go +++ b/pkg/kubelet/apis/config/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kubeletconfig +package config import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/kubelet/apis/config/scheme/scheme.go b/pkg/kubelet/apis/config/scheme/scheme.go index 2afd7531283..3c5c1450ca7 100644 --- a/pkg/kubelet/apis/config/scheme/scheme.go +++ b/pkg/kubelet/apis/config/scheme/scheme.go @@ -19,8 +19,8 @@ package scheme import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" ) // Utility functions for the Kubelet's kubeletconfig API group diff --git a/pkg/kubelet/apis/config/scheme/scheme_test.go b/pkg/kubelet/apis/config/scheme/scheme_test.go index bbb91b320a9..30e9035760e 100644 --- a/pkg/kubelet/apis/config/scheme/scheme_test.go +++ b/pkg/kubelet/apis/config/scheme/scheme_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/fuzzer" + "k8s.io/kubernetes/pkg/kubelet/apis/config/fuzzer" ) func TestRoundTripTypes(t *testing.T) { diff --git a/pkg/kubelet/apis/config/types.go b/pkg/kubelet/apis/config/types.go index 2fc78cc2b60..2f7540f4a2d 100644 --- a/pkg/kubelet/apis/config/types.go +++ b/pkg/kubelet/apis/config/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kubeletconfig +package config import ( "k8s.io/api/core/v1" diff --git a/pkg/kubelet/apis/config/v1beta1/doc.go b/pkg/kubelet/apis/config/v1beta1/doc.go index 862aae3ecff..6c8a690e095 100644 --- a/pkg/kubelet/apis/config/v1beta1/doc.go +++ b/pkg/kubelet/apis/config/v1beta1/doc.go @@ -15,8 +15,8 @@ limitations under the License. */ // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig +// +k8s:conversion-gen=k8s.io/kubernetes/pkg/kubelet/apis/config // +k8s:openapi-gen=true // +k8s:defaulter-gen=TypeMeta -package v1beta1 // import "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" +package v1beta1 // import "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" diff --git a/pkg/kubelet/apis/config/v1beta1/zz_generated.conversion.go b/pkg/kubelet/apis/config/v1beta1/zz_generated.conversion.go index 203cde19cfb..13281ad3135 100644 --- a/pkg/kubelet/apis/config/v1beta1/zz_generated.conversion.go +++ b/pkg/kubelet/apis/config/v1beta1/zz_generated.conversion.go @@ -26,7 +26,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + config "k8s.io/kubernetes/pkg/kubelet/apis/config" ) func init() { @@ -36,176 +36,176 @@ func init() { // RegisterConversions adds conversion functions to the given scheme. // Public to allow building arbitrary schemes. func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*KubeletAnonymousAuthentication)(nil), (*kubeletconfig.KubeletAnonymousAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletAnonymousAuthentication_To_kubeletconfig_KubeletAnonymousAuthentication(a.(*KubeletAnonymousAuthentication), b.(*kubeletconfig.KubeletAnonymousAuthentication), scope) + if err := s.AddGeneratedConversionFunc((*KubeletAnonymousAuthentication)(nil), (*config.KubeletAnonymousAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletAnonymousAuthentication_To_config_KubeletAnonymousAuthentication(a.(*KubeletAnonymousAuthentication), b.(*config.KubeletAnonymousAuthentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletAnonymousAuthentication)(nil), (*KubeletAnonymousAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(a.(*kubeletconfig.KubeletAnonymousAuthentication), b.(*KubeletAnonymousAuthentication), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletAnonymousAuthentication)(nil), (*KubeletAnonymousAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(a.(*config.KubeletAnonymousAuthentication), b.(*KubeletAnonymousAuthentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*KubeletAuthentication)(nil), (*kubeletconfig.KubeletAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication(a.(*KubeletAuthentication), b.(*kubeletconfig.KubeletAuthentication), scope) + if err := s.AddGeneratedConversionFunc((*KubeletAuthentication)(nil), (*config.KubeletAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletAuthentication_To_config_KubeletAuthentication(a.(*KubeletAuthentication), b.(*config.KubeletAuthentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletAuthentication)(nil), (*KubeletAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletAuthentication_To_v1beta1_KubeletAuthentication(a.(*kubeletconfig.KubeletAuthentication), b.(*KubeletAuthentication), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletAuthentication)(nil), (*KubeletAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletAuthentication_To_v1beta1_KubeletAuthentication(a.(*config.KubeletAuthentication), b.(*KubeletAuthentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*KubeletAuthorization)(nil), (*kubeletconfig.KubeletAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletAuthorization_To_kubeletconfig_KubeletAuthorization(a.(*KubeletAuthorization), b.(*kubeletconfig.KubeletAuthorization), scope) + if err := s.AddGeneratedConversionFunc((*KubeletAuthorization)(nil), (*config.KubeletAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletAuthorization_To_config_KubeletAuthorization(a.(*KubeletAuthorization), b.(*config.KubeletAuthorization), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletAuthorization)(nil), (*KubeletAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletAuthorization_To_v1beta1_KubeletAuthorization(a.(*kubeletconfig.KubeletAuthorization), b.(*KubeletAuthorization), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletAuthorization)(nil), (*KubeletAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletAuthorization_To_v1beta1_KubeletAuthorization(a.(*config.KubeletAuthorization), b.(*KubeletAuthorization), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*KubeletConfiguration)(nil), (*kubeletconfig.KubeletConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfiguration(a.(*KubeletConfiguration), b.(*kubeletconfig.KubeletConfiguration), scope) + if err := s.AddGeneratedConversionFunc((*KubeletConfiguration)(nil), (*config.KubeletConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletConfiguration_To_config_KubeletConfiguration(a.(*KubeletConfiguration), b.(*config.KubeletConfiguration), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletConfiguration)(nil), (*KubeletConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfiguration(a.(*kubeletconfig.KubeletConfiguration), b.(*KubeletConfiguration), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletConfiguration)(nil), (*KubeletConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletConfiguration_To_v1beta1_KubeletConfiguration(a.(*config.KubeletConfiguration), b.(*KubeletConfiguration), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*KubeletWebhookAuthentication)(nil), (*kubeletconfig.KubeletWebhookAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWebhookAuthentication(a.(*KubeletWebhookAuthentication), b.(*kubeletconfig.KubeletWebhookAuthentication), scope) + if err := s.AddGeneratedConversionFunc((*KubeletWebhookAuthentication)(nil), (*config.KubeletWebhookAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletWebhookAuthentication_To_config_KubeletWebhookAuthentication(a.(*KubeletWebhookAuthentication), b.(*config.KubeletWebhookAuthentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletWebhookAuthentication)(nil), (*KubeletWebhookAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(a.(*kubeletconfig.KubeletWebhookAuthentication), b.(*KubeletWebhookAuthentication), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletWebhookAuthentication)(nil), (*KubeletWebhookAuthentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(a.(*config.KubeletWebhookAuthentication), b.(*KubeletWebhookAuthentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*KubeletWebhookAuthorization)(nil), (*kubeletconfig.KubeletWebhookAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletWebhookAuthorization_To_kubeletconfig_KubeletWebhookAuthorization(a.(*KubeletWebhookAuthorization), b.(*kubeletconfig.KubeletWebhookAuthorization), scope) + if err := s.AddGeneratedConversionFunc((*KubeletWebhookAuthorization)(nil), (*config.KubeletWebhookAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletWebhookAuthorization_To_config_KubeletWebhookAuthorization(a.(*KubeletWebhookAuthorization), b.(*config.KubeletWebhookAuthorization), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletWebhookAuthorization)(nil), (*KubeletWebhookAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(a.(*kubeletconfig.KubeletWebhookAuthorization), b.(*KubeletWebhookAuthorization), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletWebhookAuthorization)(nil), (*KubeletWebhookAuthorization)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(a.(*config.KubeletWebhookAuthorization), b.(*KubeletWebhookAuthorization), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*KubeletX509Authentication)(nil), (*kubeletconfig.KubeletX509Authentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_KubeletX509Authentication_To_kubeletconfig_KubeletX509Authentication(a.(*KubeletX509Authentication), b.(*kubeletconfig.KubeletX509Authentication), scope) + if err := s.AddGeneratedConversionFunc((*KubeletX509Authentication)(nil), (*config.KubeletX509Authentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_KubeletX509Authentication_To_config_KubeletX509Authentication(a.(*KubeletX509Authentication), b.(*config.KubeletX509Authentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.KubeletX509Authentication)(nil), (*KubeletX509Authentication)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(a.(*kubeletconfig.KubeletX509Authentication), b.(*KubeletX509Authentication), scope) + if err := s.AddGeneratedConversionFunc((*config.KubeletX509Authentication)(nil), (*KubeletX509Authentication)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(a.(*config.KubeletX509Authentication), b.(*KubeletX509Authentication), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*SerializedNodeConfigSource)(nil), (*kubeletconfig.SerializedNodeConfigSource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1beta1_SerializedNodeConfigSource_To_kubeletconfig_SerializedNodeConfigSource(a.(*SerializedNodeConfigSource), b.(*kubeletconfig.SerializedNodeConfigSource), scope) + if err := s.AddGeneratedConversionFunc((*SerializedNodeConfigSource)(nil), (*config.SerializedNodeConfigSource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_SerializedNodeConfigSource_To_config_SerializedNodeConfigSource(a.(*SerializedNodeConfigSource), b.(*config.SerializedNodeConfigSource), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*kubeletconfig.SerializedNodeConfigSource)(nil), (*SerializedNodeConfigSource)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_kubeletconfig_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(a.(*kubeletconfig.SerializedNodeConfigSource), b.(*SerializedNodeConfigSource), scope) + if err := s.AddGeneratedConversionFunc((*config.SerializedNodeConfigSource)(nil), (*SerializedNodeConfigSource)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(a.(*config.SerializedNodeConfigSource), b.(*SerializedNodeConfigSource), scope) }); err != nil { return err } return nil } -func autoConvert_v1beta1_KubeletAnonymousAuthentication_To_kubeletconfig_KubeletAnonymousAuthentication(in *KubeletAnonymousAuthentication, out *kubeletconfig.KubeletAnonymousAuthentication, s conversion.Scope) error { +func autoConvert_v1beta1_KubeletAnonymousAuthentication_To_config_KubeletAnonymousAuthentication(in *KubeletAnonymousAuthentication, out *config.KubeletAnonymousAuthentication, s conversion.Scope) error { if err := v1.Convert_Pointer_bool_To_bool(&in.Enabled, &out.Enabled, s); err != nil { return err } return nil } -// Convert_v1beta1_KubeletAnonymousAuthentication_To_kubeletconfig_KubeletAnonymousAuthentication is an autogenerated conversion function. -func Convert_v1beta1_KubeletAnonymousAuthentication_To_kubeletconfig_KubeletAnonymousAuthentication(in *KubeletAnonymousAuthentication, out *kubeletconfig.KubeletAnonymousAuthentication, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletAnonymousAuthentication_To_kubeletconfig_KubeletAnonymousAuthentication(in, out, s) +// Convert_v1beta1_KubeletAnonymousAuthentication_To_config_KubeletAnonymousAuthentication is an autogenerated conversion function. +func Convert_v1beta1_KubeletAnonymousAuthentication_To_config_KubeletAnonymousAuthentication(in *KubeletAnonymousAuthentication, out *config.KubeletAnonymousAuthentication, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletAnonymousAuthentication_To_config_KubeletAnonymousAuthentication(in, out, s) } -func autoConvert_kubeletconfig_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(in *kubeletconfig.KubeletAnonymousAuthentication, out *KubeletAnonymousAuthentication, s conversion.Scope) error { +func autoConvert_config_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(in *config.KubeletAnonymousAuthentication, out *KubeletAnonymousAuthentication, s conversion.Scope) error { if err := v1.Convert_bool_To_Pointer_bool(&in.Enabled, &out.Enabled, s); err != nil { return err } return nil } -// Convert_kubeletconfig_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(in *kubeletconfig.KubeletAnonymousAuthentication, out *KubeletAnonymousAuthentication, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(in, out, s) +// Convert_config_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication is an autogenerated conversion function. +func Convert_config_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(in *config.KubeletAnonymousAuthentication, out *KubeletAnonymousAuthentication, s conversion.Scope) error { + return autoConvert_config_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(in, out, s) } -func autoConvert_v1beta1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication(in *KubeletAuthentication, out *kubeletconfig.KubeletAuthentication, s conversion.Scope) error { - if err := Convert_v1beta1_KubeletX509Authentication_To_kubeletconfig_KubeletX509Authentication(&in.X509, &out.X509, s); err != nil { +func autoConvert_v1beta1_KubeletAuthentication_To_config_KubeletAuthentication(in *KubeletAuthentication, out *config.KubeletAuthentication, s conversion.Scope) error { + if err := Convert_v1beta1_KubeletX509Authentication_To_config_KubeletX509Authentication(&in.X509, &out.X509, s); err != nil { return err } - if err := Convert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWebhookAuthentication(&in.Webhook, &out.Webhook, s); err != nil { + if err := Convert_v1beta1_KubeletWebhookAuthentication_To_config_KubeletWebhookAuthentication(&in.Webhook, &out.Webhook, s); err != nil { return err } - if err := Convert_v1beta1_KubeletAnonymousAuthentication_To_kubeletconfig_KubeletAnonymousAuthentication(&in.Anonymous, &out.Anonymous, s); err != nil { + if err := Convert_v1beta1_KubeletAnonymousAuthentication_To_config_KubeletAnonymousAuthentication(&in.Anonymous, &out.Anonymous, s); err != nil { return err } return nil } -// Convert_v1beta1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication is an autogenerated conversion function. -func Convert_v1beta1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication(in *KubeletAuthentication, out *kubeletconfig.KubeletAuthentication, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication(in, out, s) +// Convert_v1beta1_KubeletAuthentication_To_config_KubeletAuthentication is an autogenerated conversion function. +func Convert_v1beta1_KubeletAuthentication_To_config_KubeletAuthentication(in *KubeletAuthentication, out *config.KubeletAuthentication, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletAuthentication_To_config_KubeletAuthentication(in, out, s) } -func autoConvert_kubeletconfig_KubeletAuthentication_To_v1beta1_KubeletAuthentication(in *kubeletconfig.KubeletAuthentication, out *KubeletAuthentication, s conversion.Scope) error { - if err := Convert_kubeletconfig_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(&in.X509, &out.X509, s); err != nil { +func autoConvert_config_KubeletAuthentication_To_v1beta1_KubeletAuthentication(in *config.KubeletAuthentication, out *KubeletAuthentication, s conversion.Scope) error { + if err := Convert_config_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(&in.X509, &out.X509, s); err != nil { return err } - if err := Convert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(&in.Webhook, &out.Webhook, s); err != nil { + if err := Convert_config_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(&in.Webhook, &out.Webhook, s); err != nil { return err } - if err := Convert_kubeletconfig_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(&in.Anonymous, &out.Anonymous, s); err != nil { + if err := Convert_config_KubeletAnonymousAuthentication_To_v1beta1_KubeletAnonymousAuthentication(&in.Anonymous, &out.Anonymous, s); err != nil { return err } return nil } -// Convert_kubeletconfig_KubeletAuthentication_To_v1beta1_KubeletAuthentication is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletAuthentication_To_v1beta1_KubeletAuthentication(in *kubeletconfig.KubeletAuthentication, out *KubeletAuthentication, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletAuthentication_To_v1beta1_KubeletAuthentication(in, out, s) +// Convert_config_KubeletAuthentication_To_v1beta1_KubeletAuthentication is an autogenerated conversion function. +func Convert_config_KubeletAuthentication_To_v1beta1_KubeletAuthentication(in *config.KubeletAuthentication, out *KubeletAuthentication, s conversion.Scope) error { + return autoConvert_config_KubeletAuthentication_To_v1beta1_KubeletAuthentication(in, out, s) } -func autoConvert_v1beta1_KubeletAuthorization_To_kubeletconfig_KubeletAuthorization(in *KubeletAuthorization, out *kubeletconfig.KubeletAuthorization, s conversion.Scope) error { - out.Mode = kubeletconfig.KubeletAuthorizationMode(in.Mode) - if err := Convert_v1beta1_KubeletWebhookAuthorization_To_kubeletconfig_KubeletWebhookAuthorization(&in.Webhook, &out.Webhook, s); err != nil { +func autoConvert_v1beta1_KubeletAuthorization_To_config_KubeletAuthorization(in *KubeletAuthorization, out *config.KubeletAuthorization, s conversion.Scope) error { + out.Mode = config.KubeletAuthorizationMode(in.Mode) + if err := Convert_v1beta1_KubeletWebhookAuthorization_To_config_KubeletWebhookAuthorization(&in.Webhook, &out.Webhook, s); err != nil { return err } return nil } -// Convert_v1beta1_KubeletAuthorization_To_kubeletconfig_KubeletAuthorization is an autogenerated conversion function. -func Convert_v1beta1_KubeletAuthorization_To_kubeletconfig_KubeletAuthorization(in *KubeletAuthorization, out *kubeletconfig.KubeletAuthorization, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletAuthorization_To_kubeletconfig_KubeletAuthorization(in, out, s) +// Convert_v1beta1_KubeletAuthorization_To_config_KubeletAuthorization is an autogenerated conversion function. +func Convert_v1beta1_KubeletAuthorization_To_config_KubeletAuthorization(in *KubeletAuthorization, out *config.KubeletAuthorization, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletAuthorization_To_config_KubeletAuthorization(in, out, s) } -func autoConvert_kubeletconfig_KubeletAuthorization_To_v1beta1_KubeletAuthorization(in *kubeletconfig.KubeletAuthorization, out *KubeletAuthorization, s conversion.Scope) error { +func autoConvert_config_KubeletAuthorization_To_v1beta1_KubeletAuthorization(in *config.KubeletAuthorization, out *KubeletAuthorization, s conversion.Scope) error { out.Mode = KubeletAuthorizationMode(in.Mode) - if err := Convert_kubeletconfig_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(&in.Webhook, &out.Webhook, s); err != nil { + if err := Convert_config_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(&in.Webhook, &out.Webhook, s); err != nil { return err } return nil } -// Convert_kubeletconfig_KubeletAuthorization_To_v1beta1_KubeletAuthorization is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletAuthorization_To_v1beta1_KubeletAuthorization(in *kubeletconfig.KubeletAuthorization, out *KubeletAuthorization, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletAuthorization_To_v1beta1_KubeletAuthorization(in, out, s) +// Convert_config_KubeletAuthorization_To_v1beta1_KubeletAuthorization is an autogenerated conversion function. +func Convert_config_KubeletAuthorization_To_v1beta1_KubeletAuthorization(in *config.KubeletAuthorization, out *KubeletAuthorization, s conversion.Scope) error { + return autoConvert_config_KubeletAuthorization_To_v1beta1_KubeletAuthorization(in, out, s) } -func autoConvert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfiguration(in *KubeletConfiguration, out *kubeletconfig.KubeletConfiguration, s conversion.Scope) error { +func autoConvert_v1beta1_KubeletConfiguration_To_config_KubeletConfiguration(in *KubeletConfiguration, out *config.KubeletConfiguration, s conversion.Scope) error { out.StaticPodPath = in.StaticPodPath out.SyncFrequency = in.SyncFrequency out.FileCheckFrequency = in.FileCheckFrequency @@ -221,10 +221,10 @@ func autoConvert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfigurat out.TLSMinVersion = in.TLSMinVersion out.RotateCertificates = in.RotateCertificates out.ServerTLSBootstrap = in.ServerTLSBootstrap - if err := Convert_v1beta1_KubeletAuthentication_To_kubeletconfig_KubeletAuthentication(&in.Authentication, &out.Authentication, s); err != nil { + if err := Convert_v1beta1_KubeletAuthentication_To_config_KubeletAuthentication(&in.Authentication, &out.Authentication, s); err != nil { return err } - if err := Convert_v1beta1_KubeletAuthorization_To_kubeletconfig_KubeletAuthorization(&in.Authorization, &out.Authorization, s); err != nil { + if err := Convert_v1beta1_KubeletAuthorization_To_config_KubeletAuthorization(&in.Authorization, &out.Authorization, s); err != nil { return err } if err := v1.Convert_Pointer_int32_To_int32(&in.RegistryPullQPS, &out.RegistryPullQPS, s); err != nil { @@ -317,7 +317,7 @@ func autoConvert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfigurat if err := v1.Convert_Pointer_int32_To_int32(&in.ContainerLogMaxFiles, &out.ContainerLogMaxFiles, s); err != nil { return err } - out.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfig.ResourceChangeDetectionStrategy(in.ConfigMapAndSecretChangeDetectionStrategy) + out.ConfigMapAndSecretChangeDetectionStrategy = config.ResourceChangeDetectionStrategy(in.ConfigMapAndSecretChangeDetectionStrategy) out.SystemReserved = *(*map[string]string)(unsafe.Pointer(&in.SystemReserved)) out.KubeReserved = *(*map[string]string)(unsafe.Pointer(&in.KubeReserved)) out.SystemReservedCgroup = in.SystemReservedCgroup @@ -326,12 +326,12 @@ func autoConvert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfigurat return nil } -// Convert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfiguration is an autogenerated conversion function. -func Convert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfiguration(in *KubeletConfiguration, out *kubeletconfig.KubeletConfiguration, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletConfiguration_To_kubeletconfig_KubeletConfiguration(in, out, s) +// Convert_v1beta1_KubeletConfiguration_To_config_KubeletConfiguration is an autogenerated conversion function. +func Convert_v1beta1_KubeletConfiguration_To_config_KubeletConfiguration(in *KubeletConfiguration, out *config.KubeletConfiguration, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletConfiguration_To_config_KubeletConfiguration(in, out, s) } -func autoConvert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfiguration(in *kubeletconfig.KubeletConfiguration, out *KubeletConfiguration, s conversion.Scope) error { +func autoConvert_config_KubeletConfiguration_To_v1beta1_KubeletConfiguration(in *config.KubeletConfiguration, out *KubeletConfiguration, s conversion.Scope) error { out.StaticPodPath = in.StaticPodPath out.SyncFrequency = in.SyncFrequency out.FileCheckFrequency = in.FileCheckFrequency @@ -347,10 +347,10 @@ func autoConvert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfigurat out.TLSMinVersion = in.TLSMinVersion out.RotateCertificates = in.RotateCertificates out.ServerTLSBootstrap = in.ServerTLSBootstrap - if err := Convert_kubeletconfig_KubeletAuthentication_To_v1beta1_KubeletAuthentication(&in.Authentication, &out.Authentication, s); err != nil { + if err := Convert_config_KubeletAuthentication_To_v1beta1_KubeletAuthentication(&in.Authentication, &out.Authentication, s); err != nil { return err } - if err := Convert_kubeletconfig_KubeletAuthorization_To_v1beta1_KubeletAuthorization(&in.Authorization, &out.Authorization, s); err != nil { + if err := Convert_config_KubeletAuthorization_To_v1beta1_KubeletAuthorization(&in.Authorization, &out.Authorization, s); err != nil { return err } if err := v1.Convert_int32_To_Pointer_int32(&in.RegistryPullQPS, &out.RegistryPullQPS, s); err != nil { @@ -452,12 +452,12 @@ func autoConvert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfigurat return nil } -// Convert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfiguration is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfiguration(in *kubeletconfig.KubeletConfiguration, out *KubeletConfiguration, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletConfiguration_To_v1beta1_KubeletConfiguration(in, out, s) +// Convert_config_KubeletConfiguration_To_v1beta1_KubeletConfiguration is an autogenerated conversion function. +func Convert_config_KubeletConfiguration_To_v1beta1_KubeletConfiguration(in *config.KubeletConfiguration, out *KubeletConfiguration, s conversion.Scope) error { + return autoConvert_config_KubeletConfiguration_To_v1beta1_KubeletConfiguration(in, out, s) } -func autoConvert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWebhookAuthentication(in *KubeletWebhookAuthentication, out *kubeletconfig.KubeletWebhookAuthentication, s conversion.Scope) error { +func autoConvert_v1beta1_KubeletWebhookAuthentication_To_config_KubeletWebhookAuthentication(in *KubeletWebhookAuthentication, out *config.KubeletWebhookAuthentication, s conversion.Scope) error { if err := v1.Convert_Pointer_bool_To_bool(&in.Enabled, &out.Enabled, s); err != nil { return err } @@ -465,12 +465,12 @@ func autoConvert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWe return nil } -// Convert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWebhookAuthentication is an autogenerated conversion function. -func Convert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWebhookAuthentication(in *KubeletWebhookAuthentication, out *kubeletconfig.KubeletWebhookAuthentication, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletWebhookAuthentication_To_kubeletconfig_KubeletWebhookAuthentication(in, out, s) +// Convert_v1beta1_KubeletWebhookAuthentication_To_config_KubeletWebhookAuthentication is an autogenerated conversion function. +func Convert_v1beta1_KubeletWebhookAuthentication_To_config_KubeletWebhookAuthentication(in *KubeletWebhookAuthentication, out *config.KubeletWebhookAuthentication, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletWebhookAuthentication_To_config_KubeletWebhookAuthentication(in, out, s) } -func autoConvert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(in *kubeletconfig.KubeletWebhookAuthentication, out *KubeletWebhookAuthentication, s conversion.Scope) error { +func autoConvert_config_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(in *config.KubeletWebhookAuthentication, out *KubeletWebhookAuthentication, s conversion.Scope) error { if err := v1.Convert_bool_To_Pointer_bool(&in.Enabled, &out.Enabled, s); err != nil { return err } @@ -478,69 +478,69 @@ func autoConvert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWe return nil } -// Convert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(in *kubeletconfig.KubeletWebhookAuthentication, out *KubeletWebhookAuthentication, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(in, out, s) +// Convert_config_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication is an autogenerated conversion function. +func Convert_config_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(in *config.KubeletWebhookAuthentication, out *KubeletWebhookAuthentication, s conversion.Scope) error { + return autoConvert_config_KubeletWebhookAuthentication_To_v1beta1_KubeletWebhookAuthentication(in, out, s) } -func autoConvert_v1beta1_KubeletWebhookAuthorization_To_kubeletconfig_KubeletWebhookAuthorization(in *KubeletWebhookAuthorization, out *kubeletconfig.KubeletWebhookAuthorization, s conversion.Scope) error { +func autoConvert_v1beta1_KubeletWebhookAuthorization_To_config_KubeletWebhookAuthorization(in *KubeletWebhookAuthorization, out *config.KubeletWebhookAuthorization, s conversion.Scope) error { out.CacheAuthorizedTTL = in.CacheAuthorizedTTL out.CacheUnauthorizedTTL = in.CacheUnauthorizedTTL return nil } -// Convert_v1beta1_KubeletWebhookAuthorization_To_kubeletconfig_KubeletWebhookAuthorization is an autogenerated conversion function. -func Convert_v1beta1_KubeletWebhookAuthorization_To_kubeletconfig_KubeletWebhookAuthorization(in *KubeletWebhookAuthorization, out *kubeletconfig.KubeletWebhookAuthorization, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletWebhookAuthorization_To_kubeletconfig_KubeletWebhookAuthorization(in, out, s) +// Convert_v1beta1_KubeletWebhookAuthorization_To_config_KubeletWebhookAuthorization is an autogenerated conversion function. +func Convert_v1beta1_KubeletWebhookAuthorization_To_config_KubeletWebhookAuthorization(in *KubeletWebhookAuthorization, out *config.KubeletWebhookAuthorization, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletWebhookAuthorization_To_config_KubeletWebhookAuthorization(in, out, s) } -func autoConvert_kubeletconfig_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(in *kubeletconfig.KubeletWebhookAuthorization, out *KubeletWebhookAuthorization, s conversion.Scope) error { +func autoConvert_config_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(in *config.KubeletWebhookAuthorization, out *KubeletWebhookAuthorization, s conversion.Scope) error { out.CacheAuthorizedTTL = in.CacheAuthorizedTTL out.CacheUnauthorizedTTL = in.CacheUnauthorizedTTL return nil } -// Convert_kubeletconfig_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(in *kubeletconfig.KubeletWebhookAuthorization, out *KubeletWebhookAuthorization, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(in, out, s) +// Convert_config_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization is an autogenerated conversion function. +func Convert_config_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(in *config.KubeletWebhookAuthorization, out *KubeletWebhookAuthorization, s conversion.Scope) error { + return autoConvert_config_KubeletWebhookAuthorization_To_v1beta1_KubeletWebhookAuthorization(in, out, s) } -func autoConvert_v1beta1_KubeletX509Authentication_To_kubeletconfig_KubeletX509Authentication(in *KubeletX509Authentication, out *kubeletconfig.KubeletX509Authentication, s conversion.Scope) error { +func autoConvert_v1beta1_KubeletX509Authentication_To_config_KubeletX509Authentication(in *KubeletX509Authentication, out *config.KubeletX509Authentication, s conversion.Scope) error { out.ClientCAFile = in.ClientCAFile return nil } -// Convert_v1beta1_KubeletX509Authentication_To_kubeletconfig_KubeletX509Authentication is an autogenerated conversion function. -func Convert_v1beta1_KubeletX509Authentication_To_kubeletconfig_KubeletX509Authentication(in *KubeletX509Authentication, out *kubeletconfig.KubeletX509Authentication, s conversion.Scope) error { - return autoConvert_v1beta1_KubeletX509Authentication_To_kubeletconfig_KubeletX509Authentication(in, out, s) +// Convert_v1beta1_KubeletX509Authentication_To_config_KubeletX509Authentication is an autogenerated conversion function. +func Convert_v1beta1_KubeletX509Authentication_To_config_KubeletX509Authentication(in *KubeletX509Authentication, out *config.KubeletX509Authentication, s conversion.Scope) error { + return autoConvert_v1beta1_KubeletX509Authentication_To_config_KubeletX509Authentication(in, out, s) } -func autoConvert_kubeletconfig_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(in *kubeletconfig.KubeletX509Authentication, out *KubeletX509Authentication, s conversion.Scope) error { +func autoConvert_config_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(in *config.KubeletX509Authentication, out *KubeletX509Authentication, s conversion.Scope) error { out.ClientCAFile = in.ClientCAFile return nil } -// Convert_kubeletconfig_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication is an autogenerated conversion function. -func Convert_kubeletconfig_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(in *kubeletconfig.KubeletX509Authentication, out *KubeletX509Authentication, s conversion.Scope) error { - return autoConvert_kubeletconfig_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(in, out, s) +// Convert_config_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication is an autogenerated conversion function. +func Convert_config_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(in *config.KubeletX509Authentication, out *KubeletX509Authentication, s conversion.Scope) error { + return autoConvert_config_KubeletX509Authentication_To_v1beta1_KubeletX509Authentication(in, out, s) } -func autoConvert_v1beta1_SerializedNodeConfigSource_To_kubeletconfig_SerializedNodeConfigSource(in *SerializedNodeConfigSource, out *kubeletconfig.SerializedNodeConfigSource, s conversion.Scope) error { +func autoConvert_v1beta1_SerializedNodeConfigSource_To_config_SerializedNodeConfigSource(in *SerializedNodeConfigSource, out *config.SerializedNodeConfigSource, s conversion.Scope) error { out.Source = in.Source return nil } -// Convert_v1beta1_SerializedNodeConfigSource_To_kubeletconfig_SerializedNodeConfigSource is an autogenerated conversion function. -func Convert_v1beta1_SerializedNodeConfigSource_To_kubeletconfig_SerializedNodeConfigSource(in *SerializedNodeConfigSource, out *kubeletconfig.SerializedNodeConfigSource, s conversion.Scope) error { - return autoConvert_v1beta1_SerializedNodeConfigSource_To_kubeletconfig_SerializedNodeConfigSource(in, out, s) +// Convert_v1beta1_SerializedNodeConfigSource_To_config_SerializedNodeConfigSource is an autogenerated conversion function. +func Convert_v1beta1_SerializedNodeConfigSource_To_config_SerializedNodeConfigSource(in *SerializedNodeConfigSource, out *config.SerializedNodeConfigSource, s conversion.Scope) error { + return autoConvert_v1beta1_SerializedNodeConfigSource_To_config_SerializedNodeConfigSource(in, out, s) } -func autoConvert_kubeletconfig_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(in *kubeletconfig.SerializedNodeConfigSource, out *SerializedNodeConfigSource, s conversion.Scope) error { +func autoConvert_config_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(in *config.SerializedNodeConfigSource, out *SerializedNodeConfigSource, s conversion.Scope) error { out.Source = in.Source return nil } -// Convert_kubeletconfig_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource is an autogenerated conversion function. -func Convert_kubeletconfig_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(in *kubeletconfig.SerializedNodeConfigSource, out *SerializedNodeConfigSource, s conversion.Scope) error { - return autoConvert_kubeletconfig_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(in, out, s) +// Convert_config_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource is an autogenerated conversion function. +func Convert_config_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(in *config.SerializedNodeConfigSource, out *SerializedNodeConfigSource, s conversion.Scope) error { + return autoConvert_config_SerializedNodeConfigSource_To_v1beta1_SerializedNodeConfigSource(in, out, s) } diff --git a/pkg/kubelet/apis/config/validation/validation.go b/pkg/kubelet/apis/config/validation/validation.go index 2ff9b5694c7..d1d3a8b9ea0 100644 --- a/pkg/kubelet/apis/config/validation/validation.go +++ b/pkg/kubelet/apis/config/validation/validation.go @@ -23,7 +23,7 @@ import ( utilvalidation "k8s.io/apimachinery/pkg/util/validation" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" ) diff --git a/pkg/kubelet/apis/config/validation/validation_others.go b/pkg/kubelet/apis/config/validation/validation_others.go index 4cad825825e..0eb7fcd0f19 100644 --- a/pkg/kubelet/apis/config/validation/validation_others.go +++ b/pkg/kubelet/apis/config/validation/validation_others.go @@ -19,7 +19,7 @@ limitations under the License. package validation import ( - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" ) // validateKubeletOSConfiguration validates os specific kubelet configuration and returns an error if it is invalid. diff --git a/pkg/kubelet/apis/config/validation/validation_test.go b/pkg/kubelet/apis/config/validation/validation_test.go index 029a8ac6cfd..924015a64bf 100644 --- a/pkg/kubelet/apis/config/validation/validation_test.go +++ b/pkg/kubelet/apis/config/validation/validation_test.go @@ -20,7 +20,7 @@ import ( "testing" utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" ) func TestValidateKubeletConfiguration(t *testing.T) { diff --git a/pkg/kubelet/apis/config/validation/validation_windows.go b/pkg/kubelet/apis/config/validation/validation_windows.go index d1a8ec1dd6f..c2203041a8d 100644 --- a/pkg/kubelet/apis/config/validation/validation_windows.go +++ b/pkg/kubelet/apis/config/validation/validation_windows.go @@ -22,7 +22,7 @@ import ( "fmt" utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" ) // validateKubeletOSConfiguration validates os specific kubelet configuration and returns an error if it is invalid. diff --git a/pkg/kubelet/apis/config/zz_generated.deepcopy.go b/pkg/kubelet/apis/config/zz_generated.deepcopy.go index 3cd9f26eab5..3eddbbf3c09 100644 --- a/pkg/kubelet/apis/config/zz_generated.deepcopy.go +++ b/pkg/kubelet/apis/config/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // Code generated by deepcopy-gen. DO NOT EDIT. -package kubeletconfig +package config import ( runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/kubelet/certificate/kubelet.go b/pkg/kubelet/certificate/kubelet.go index dbb799ee804..e55594f8e84 100644 --- a/pkg/kubelet/certificate/kubelet.go +++ b/pkg/kubelet/certificate/kubelet.go @@ -31,7 +31,7 @@ import ( clientset "k8s.io/client-go/kubernetes" clientcertificates "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/client-go/util/certificate" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/metrics" ) diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index a0ca35e0b58..4f5f8a561b2 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -31,7 +31,7 @@ import ( "k8s.io/api/core/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/dockershim/network/cni/cni.go b/pkg/kubelet/dockershim/network/cni/cni.go index 6d0fda41194..e0bbf97c1e8 100644 --- a/pkg/kubelet/dockershim/network/cni/cni.go +++ b/pkg/kubelet/dockershim/network/cni/cni.go @@ -26,7 +26,7 @@ import ( "github.com/containernetworking/cni/libcni" cnitypes "github.com/containernetworking/cni/pkg/types" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" "k8s.io/kubernetes/pkg/util/bandwidth" diff --git a/pkg/kubelet/dockershim/network/cni/cni_test.go b/pkg/kubelet/dockershim/network/cni/cni_test.go index 717a5f28f5c..5d83d991e3b 100644 --- a/pkg/kubelet/dockershim/network/cni/cni_test.go +++ b/pkg/kubelet/dockershim/network/cni/cni_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" utiltesting "k8s.io/client-go/util/testing" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go index cb9452b246b..0aec8c38cf7 100644 --- a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux.go @@ -35,7 +35,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" utilnet "k8s.io/apimachinery/pkg/util/net" utilsets "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go index f9fd4067fee..b7e036ff8aa 100644 --- a/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_linux_test.go @@ -24,7 +24,7 @@ import ( "testing" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni/testing" diff --git a/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go b/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go index 3fb4f966e6e..ebb56e40ec3 100644 --- a/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go +++ b/pkg/kubelet/dockershim/network/kubenet/kubenet_unsupported.go @@ -21,7 +21,7 @@ package kubenet import ( "fmt" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) diff --git a/pkg/kubelet/dockershim/network/plugins.go b/pkg/kubelet/dockershim/network/plugins.go index 7968b2316ef..bcef49f77c5 100644 --- a/pkg/kubelet/dockershim/network/plugins.go +++ b/pkg/kubelet/dockershim/network/plugins.go @@ -28,7 +28,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" utilsets "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport" "k8s.io/kubernetes/pkg/kubelet/dockershim/network/metrics" diff --git a/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go b/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go index 72fc56f8973..43e6d744903 100644 --- a/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go +++ b/pkg/kubelet/dockershim/network/testing/mock_network_plugin.go @@ -23,7 +23,7 @@ package testing import ( gomock "github.com/golang/mock/gomock" sets "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" container "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" ) diff --git a/pkg/kubelet/dockershim/network/testing/plugins_test.go b/pkg/kubelet/dockershim/network/testing/plugins_test.go index 59772e0518f..29ae5b148f5 100644 --- a/pkg/kubelet/dockershim/network/testing/plugins_test.go +++ b/pkg/kubelet/dockershim/network/testing/plugins_test.go @@ -23,7 +23,7 @@ import ( "testing" utilsets "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockershim/network" sysctltest "k8s.io/kubernetes/pkg/util/sysctl/testing" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index f41ef7d717e..0a32a7fc0c4 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -57,7 +57,7 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/features" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" pluginwatcherapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubeletcertificate "k8s.io/kubernetes/pkg/kubelet/certificate" diff --git a/pkg/kubelet/kubeletconfig/checkpoint/download.go b/pkg/kubelet/kubeletconfig/checkpoint/download.go index eb7059806e6..542d8648c9c 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/download.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/download.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" + "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/status" utilcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" utillog "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/log" diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/fakestore.go b/pkg/kubelet/kubeletconfig/checkpoint/store/fakestore.go index cd72c827ad8..6e442cf2cc2 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/fakestore.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/fakestore.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" ) diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go index 94cd42fea67..382f04b5379 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore.go @@ -21,7 +21,7 @@ import ( "path/filepath" "time" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/configfiles" utilfiles "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files" diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go index ad96513c8d4..d1417b8c818 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/fsstore_test.go @@ -29,9 +29,9 @@ import ( apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" utilcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" utilfiles "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files" diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/store.go b/pkg/kubelet/kubeletconfig/checkpoint/store/store.go index 0ceb34a6007..5d2bc6f54ed 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/store.go +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/store.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" ) diff --git a/pkg/kubelet/kubeletconfig/configfiles/configfiles.go b/pkg/kubelet/kubeletconfig/configfiles/configfiles.go index c3b5fc9b479..13f111a97f7 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/configfiles.go +++ b/pkg/kubelet/kubeletconfig/configfiles/configfiles.go @@ -21,8 +21,8 @@ import ( "path/filepath" "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" utilcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" utilfs "k8s.io/kubernetes/pkg/util/filesystem" ) diff --git a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go index 2f0e5932840..eddc9c0ff4d 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go +++ b/pkg/kubelet/kubeletconfig/configfiles/configfiles_test.go @@ -22,9 +22,9 @@ import ( "testing" apiequality "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" utilfiles "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files" utiltest "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/test" utilfs "k8s.io/kubernetes/pkg/util/filesystem" diff --git a/pkg/kubelet/kubeletconfig/controller.go b/pkg/kubelet/kubeletconfig/controller.go index afe707b69ac..0dcc36c7523 100644 --- a/pkg/kubelet/kubeletconfig/controller.go +++ b/pkg/kubelet/kubeletconfig/controller.go @@ -26,8 +26,8 @@ import ( clientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/validation" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/store" diff --git a/pkg/kubelet/kubeletconfig/util/codec/codec.go b/pkg/kubelet/kubeletconfig/util/codec/codec.go index b8356fabd0e..3801bb16bcb 100644 --- a/pkg/kubelet/kubeletconfig/util/codec/codec.go +++ b/pkg/kubelet/kubeletconfig/util/codec/codec.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" ) // EncodeKubeletConfig encodes an internal KubeletConfiguration to an external YAML representation diff --git a/pkg/kubemark/hollow_kubelet.go b/pkg/kubemark/hollow_kubelet.go index fe114fb17b1..bd83d93d259 100644 --- a/pkg/kubemark/hollow_kubelet.go +++ b/pkg/kubemark/hollow_kubelet.go @@ -24,7 +24,7 @@ import ( kubeletapp "k8s.io/kubernetes/cmd/kubelet/app" "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/kubelet" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/cm" containertest "k8s.io/kubernetes/pkg/kubelet/container/testing" diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index f7dfc8aa4c1..e7d06b2ed1a 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/pkg/cloudprovider" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubemark" ) diff --git a/test/e2e_node/container_log_rotation_test.go b/test/e2e_node/container_log_rotation_test.go index 61f99451a7c..995d4b04b60 100644 --- a/test/e2e_node/container_log_rotation_test.go +++ b/test/e2e_node/container_log_rotation_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubelogs "k8s.io/kubernetes/pkg/kubelet/logs" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/test/e2e_node/cpu_manager_test.go b/test/e2e_node/cpu_manager_test.go index 36bf6f5bf8e..f10feacb406 100644 --- a/test/e2e_node/cpu_manager_test.go +++ b/test/e2e_node/cpu_manager_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/test/e2e_node/critical_pod_test.go b/test/e2e_node/critical_pod_test.go index 3ed2924d555..6eecd6ca948 100644 --- a/test/e2e_node/critical_pod_test.go +++ b/test/e2e_node/critical_pod_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeapi "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index ea4a7299807..dbcc8a85925 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/device_plugin.go b/test/e2e_node/device_plugin.go index 6315404aa9d..75da903ea7d 100644 --- a/test/e2e_node/device_plugin.go +++ b/test/e2e_node/device_plugin.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/test/e2e/framework" pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1" diff --git a/test/e2e_node/dynamic_kubelet_config_test.go b/test/e2e_node/dynamic_kubelet_config_test.go index b30fbccb1b5..60ad4956548 100644 --- a/test/e2e_node/dynamic_kubelet_config_test.go +++ b/test/e2e_node/dynamic_kubelet_config_test.go @@ -29,7 +29,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" controller "k8s.io/kubernetes/pkg/kubelet/kubeletconfig" "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/status" "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index 6afa0e4356f..8886b3e202c 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" nodeutil "k8s.io/kubernetes/pkg/api/v1/node" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/eviction" kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/test/e2e_node/hugepages_test.go b/test/e2e_node/hugepages_test.go index 7096b3a4e53..a6a290fe5b1 100644 --- a/test/e2e_node/hugepages_test.go +++ b/test/e2e_node/hugepages_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e_node/node_container_manager_test.go b/test/e2e_node/node_container_manager_test.go index 58223e08434..904eec89a0a 100644 --- a/test/e2e_node/node_container_manager_test.go +++ b/test/e2e_node/node_container_manager_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_node/services/kubelet.go b/test/e2e_node/services/kubelet.go index 5d37ca931f1..c5064e1ffb6 100644 --- a/test/e2e_node/services/kubelet.go +++ b/test/e2e_node/services/kubelet.go @@ -34,8 +34,8 @@ import ( utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e_node/builder" diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index a33ae7cc699..769fdb7e2bf 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -36,8 +36,8 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/features" internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" - kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" + kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" From 994ac985866e7c04f5ee07a178133404c92cd39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 29 Aug 2018 20:21:09 +0300 Subject: [PATCH 3/4] Update api violations, golint failures and gofmt --- api/api-rules/violation_exceptions.list | 6 +++--- hack/.golint_failures | 4 ++-- pkg/kubelet/dockershim/docker_service.go | 2 +- pkg/kubelet/kubelet.go | 2 +- test/e2e_node/cpu_manager_test.go | 2 +- test/e2e_node/util.go | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list index f9fed939451..891b48be7e4 100644 --- a/api/api-rules/violation_exceptions.list +++ b/api/api-rules/violation_exceptions.list @@ -167,8 +167,8 @@ API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alp API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,VolumeConfiguration,EnableDynamicProvisioning API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,VolumeConfiguration,PersistentVolumeRecyclerConfiguration API rule violation: names_match,k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1,VolumeConfiguration,FlexVolumePluginDir -API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1,KubeletConfiguration,ResolverConfig -API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1,KubeletConfiguration,IPTablesMasqueradeBit -API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1,KubeletConfiguration,IPTablesDropBit +API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1,KubeletConfiguration,ResolverConfig +API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1,KubeletConfiguration,IPTablesMasqueradeBit +API rule violation: names_match,k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1,KubeletConfiguration,IPTablesDropBit API rule violation: names_match,k8s.io/metrics/pkg/apis/custom_metrics/v1beta1,MetricValue,WindowSeconds API rule violation: names_match,k8s.io/metrics/pkg/apis/external_metrics/v1beta1,ExternalMetricValue,WindowSeconds diff --git a/hack/.golint_failures b/hack/.golint_failures index c240ea2073f..d2d64fdaa48 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -179,12 +179,12 @@ pkg/kubectl/util pkg/kubectl/util/slice pkg/kubelet pkg/kubelet/apis +pkg/kubelet/apis/config +pkg/kubelet/apis/config/v1beta1 pkg/kubelet/apis/cri/runtime/v1alpha2 pkg/kubelet/apis/cri/testing pkg/kubelet/apis/deviceplugin/v1alpha pkg/kubelet/apis/deviceplugin/v1beta1 -pkg/kubelet/apis/kubeletconfig -pkg/kubelet/apis/kubeletconfig/v1beta1 pkg/kubelet/apis/pluginregistration/v1alpha1 pkg/kubelet/cadvisor pkg/kubelet/cadvisor/testing diff --git a/pkg/kubelet/dockershim/docker_service.go b/pkg/kubelet/dockershim/docker_service.go index 4f5f8a561b2..ae1f70f5218 100644 --- a/pkg/kubelet/dockershim/docker_service.go +++ b/pkg/kubelet/dockershim/docker_service.go @@ -30,8 +30,8 @@ import ( "github.com/golang/glog" "k8s.io/api/core/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 0a32a7fc0c4..d7f111cbea8 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -56,8 +56,8 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/features" - internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config" + internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" pluginwatcherapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubeletcertificate "k8s.io/kubernetes/pkg/kubelet/certificate" diff --git a/test/e2e_node/cpu_manager_test.go b/test/e2e_node/cpu_manager_test.go index f10feacb406..852f610b7f1 100644 --- a/test/e2e_node/cpu_manager_test.go +++ b/test/e2e_node/cpu_manager_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/cpuset" "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/test/e2e_node/util.go b/test/e2e_node/util.go index 769fdb7e2bf..e9942268ae4 100644 --- a/test/e2e_node/util.go +++ b/test/e2e_node/util.go @@ -35,9 +35,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/kubernetes/scheme" "k8s.io/kubernetes/pkg/features" - internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" + internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/cm" kubeletconfigcodec "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec" From 844487aea44f0c3fc152e36bf47174b5447a069e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 29 Aug 2018 20:21:17 +0300 Subject: [PATCH 4/4] autogenerated --- cmd/kubeadm/app/apis/kubeadm/BUILD | 2 +- cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD | 4 ++-- cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD | 6 ++--- cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD | 6 ++--- cmd/kubeadm/app/componentconfigs/BUILD | 8 +++---- cmd/kubeadm/app/phases/kubelet/BUILD | 4 ++-- cmd/kubelet/app/BUILD | 8 +++---- cmd/kubelet/app/options/BUILD | 8 +++---- pkg/generated/openapi/BUILD | 2 +- pkg/kubelet/BUILD | 2 +- pkg/kubelet/apis/BUILD | 2 +- pkg/kubelet/apis/config/BUILD | 10 ++++---- pkg/kubelet/apis/config/fuzzer/BUILD | 6 ++--- pkg/kubelet/apis/config/scheme/BUILD | 8 +++---- pkg/kubelet/apis/config/v1beta1/BUILD | 4 ++-- pkg/kubelet/apis/config/validation/BUILD | 6 ++--- pkg/kubelet/certificate/BUILD | 2 +- pkg/kubelet/dockershim/BUILD | 2 +- pkg/kubelet/dockershim/network/BUILD | 2 +- pkg/kubelet/dockershim/network/cni/BUILD | 4 ++-- pkg/kubelet/dockershim/network/kubenet/BUILD | 24 +++++++++---------- pkg/kubelet/dockershim/network/testing/BUILD | 4 ++-- pkg/kubelet/kubeletconfig/BUILD | 4 ++-- pkg/kubelet/kubeletconfig/checkpoint/BUILD | 6 ++--- .../kubeletconfig/checkpoint/store/BUILD | 8 +++---- pkg/kubelet/kubeletconfig/configfiles/BUILD | 10 ++++---- pkg/kubelet/kubeletconfig/util/codec/BUILD | 4 ++-- pkg/kubemark/BUILD | 2 +- test/e2e/framework/BUILD | 2 +- test/e2e_node/BUILD | 6 ++--- test/e2e_node/services/BUILD | 4 ++-- 31 files changed, 85 insertions(+), 85 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/BUILD b/cmd/kubeadm/app/apis/kubeadm/BUILD index d8c3f057874..3036d93c72b 100644 --- a/cmd/kubeadm/app/apis/kubeadm/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/BUILD @@ -18,7 +18,7 @@ go_library( ], importpath = "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/proxy/apis/config: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", diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD b/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD index 0b7fe7224b1..b97dade415c 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/BUILD @@ -13,8 +13,8 @@ go_library( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/componentconfigs:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/proxy/apis/config: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", diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD index 66f826eece0..fbd32e49635 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha2/BUILD @@ -21,9 +21,9 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/componentconfigs:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/proxy/apis/config:go_default_library", "//pkg/proxy/apis/config/scheme:go_default_library", "//pkg/proxy/apis/config/v1alpha1:go_default_library", diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD index b15cd86c86f..265e5cef579 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha3/BUILD @@ -20,9 +20,9 @@ go_library( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/proxy/apis/config:go_default_library", "//pkg/proxy/apis/config/scheme:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/cmd/kubeadm/app/componentconfigs/BUILD b/cmd/kubeadm/app/componentconfigs/BUILD index 6dd5733ad06..0c9a22b732d 100644 --- a/cmd/kubeadm/app/componentconfigs/BUILD +++ b/cmd/kubeadm/app/componentconfigs/BUILD @@ -15,9 +15,9 @@ go_library( "//cmd/kubeadm/app/apis/kubeadm/v1alpha3:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//cmd/kubeadm/app/util:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/validation:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", + "//pkg/kubelet/apis/config/validation:go_default_library", "//pkg/proxy/apis/config:go_default_library", "//pkg/proxy/apis/config/v1alpha1:go_default_library", "//pkg/proxy/apis/config/validation:go_default_library", @@ -53,7 +53,7 @@ go_test( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/proxy/apis/config:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", diff --git a/cmd/kubeadm/app/phases/kubelet/BUILD b/cmd/kubeadm/app/phases/kubelet/BUILD index ffcc960e053..c57dbac93f3 100644 --- a/cmd/kubeadm/app/phases/kubelet/BUILD +++ b/cmd/kubeadm/app/phases/kubelet/BUILD @@ -19,7 +19,7 @@ go_library( "//cmd/kubeadm/app/util:go_default_library", "//cmd/kubeadm/app/util/apiclient:go_default_library", "//pkg/apis/rbac/v1:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/util/initsystem:go_default_library", "//pkg/util/node:go_default_library", "//pkg/util/procfs:go_default_library", @@ -46,7 +46,7 @@ go_test( "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/util/version: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", diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index c0857155d36..1f4fe45ee24 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -39,10 +39,10 @@ go_library( "//pkg/credentialprovider/rancher:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/validation:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", + "//pkg/kubelet/apis/config/validation:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/certificate:go_default_library", "//pkg/kubelet/certificate/bootstrap:go_default_library", diff --git a/cmd/kubelet/app/options/BUILD b/cmd/kubelet/app/options/BUILD index c941a0e49b5..5c127a4b978 100644 --- a/cmd/kubelet/app/options/BUILD +++ b/cmd/kubelet/app/options/BUILD @@ -24,10 +24,10 @@ go_library( "//pkg/credentialprovider/azure:go_default_library", "//pkg/credentialprovider/gcp:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/validation:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", + "//pkg/kubelet/apis/config/validation:go_default_library", "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/master/ports:go_default_library", diff --git a/pkg/generated/openapi/BUILD b/pkg/generated/openapi/BUILD index 3b42f799597..a0ec8037baa 100644 --- a/pkg/generated/openapi/BUILD +++ b/pkg/generated/openapi/BUILD @@ -14,7 +14,7 @@ openapi_library( "pkg/apis/abac/v0", "pkg/apis/abac/v1beta1", "pkg/apis/componentconfig/v1alpha1", - "pkg/kubelet/apis/kubeletconfig/v1beta1", + "pkg/kubelet/apis/config/v1beta1", "pkg/version", ], tags = ["automanaged"], diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 6ed7cae60c0..96e3f08ee96 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -41,9 +41,9 @@ go_library( "//pkg/features:go_default_library", "//pkg/fieldpath:go_default_library", "//pkg/kubelet/apis:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/apis/pluginregistration/v1alpha1:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/certificate:go_default_library", diff --git a/pkg/kubelet/apis/BUILD b/pkg/kubelet/apis/BUILD index a9b6166c379..1139f848398 100644 --- a/pkg/kubelet/apis/BUILD +++ b/pkg/kubelet/apis/BUILD @@ -33,10 +33,10 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", + "//pkg/kubelet/apis/config:all-srcs", "//pkg/kubelet/apis/cri:all-srcs", "//pkg/kubelet/apis/deviceplugin/v1alpha:all-srcs", "//pkg/kubelet/apis/deviceplugin/v1beta1:all-srcs", - "//pkg/kubelet/apis/kubeletconfig:all-srcs", "//pkg/kubelet/apis/pluginregistration/v1alpha1:all-srcs", "//pkg/kubelet/apis/stats/v1alpha1:all-srcs", ], diff --git a/pkg/kubelet/apis/config/BUILD b/pkg/kubelet/apis/config/BUILD index b6b1232a024..eab836ff812 100644 --- a/pkg/kubelet/apis/config/BUILD +++ b/pkg/kubelet/apis/config/BUILD @@ -15,7 +15,7 @@ go_library( "types.go", "zz_generated.deepcopy.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig", + importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config", deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -35,10 +35,10 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubelet/apis/kubeletconfig/fuzzer:all-srcs", - "//pkg/kubelet/apis/kubeletconfig/scheme:all-srcs", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:all-srcs", - "//pkg/kubelet/apis/kubeletconfig/validation:all-srcs", + "//pkg/kubelet/apis/config/fuzzer:all-srcs", + "//pkg/kubelet/apis/config/scheme:all-srcs", + "//pkg/kubelet/apis/config/v1beta1:all-srcs", + "//pkg/kubelet/apis/config/validation:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/apis/config/fuzzer/BUILD b/pkg/kubelet/apis/config/fuzzer/BUILD index bda57e0fcda..f03c64246aa 100644 --- a/pkg/kubelet/apis/config/fuzzer/BUILD +++ b/pkg/kubelet/apis/config/fuzzer/BUILD @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["fuzzer.go"], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/fuzzer", + importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/fuzzer", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/master/ports:go_default_library", diff --git a/pkg/kubelet/apis/config/scheme/BUILD b/pkg/kubelet/apis/config/scheme/BUILD index 1dc740b500b..bf40b15a5f0 100644 --- a/pkg/kubelet/apis/config/scheme/BUILD +++ b/pkg/kubelet/apis/config/scheme/BUILD @@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["scheme.go"], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme", + importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", ], @@ -32,7 +32,7 @@ go_test( srcs = ["scheme_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/kubeletconfig/fuzzer:go_default_library", + "//pkg/kubelet/apis/config/fuzzer:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip:go_default_library", ], ) diff --git a/pkg/kubelet/apis/config/v1beta1/BUILD b/pkg/kubelet/apis/config/v1beta1/BUILD index ec53d332233..67bc052b9db 100644 --- a/pkg/kubelet/apis/config/v1beta1/BUILD +++ b/pkg/kubelet/apis/config/v1beta1/BUILD @@ -16,9 +16,9 @@ go_library( "zz_generated.deepcopy.go", "zz_generated.defaults.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1", + importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/master/ports:go_default_library", diff --git a/pkg/kubelet/apis/config/validation/BUILD b/pkg/kubelet/apis/config/validation/BUILD index f0909732f34..4264132db7a 100644 --- a/pkg/kubelet/apis/config/validation/BUILD +++ b/pkg/kubelet/apis/config/validation/BUILD @@ -13,10 +13,10 @@ go_library( "validation_others.go", "validation_windows.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/validation", + importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/validation", deps = [ "//pkg/features:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", @@ -42,7 +42,7 @@ go_test( srcs = ["validation_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", ], ) diff --git a/pkg/kubelet/certificate/BUILD b/pkg/kubelet/certificate/BUILD index 0ef7eaf52f3..fe659984028 100644 --- a/pkg/kubelet/certificate/BUILD +++ b/pkg/kubelet/certificate/BUILD @@ -14,7 +14,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/certificate", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index d2496b46463..d835f257060 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -32,8 +32,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/credentialprovider:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/checkpointmanager:go_default_library", "//pkg/kubelet/checkpointmanager/checksum:go_default_library", "//pkg/kubelet/checkpointmanager/errors:go_default_library", diff --git a/pkg/kubelet/dockershim/network/BUILD b/pkg/kubelet/dockershim/network/BUILD index 86d77f909c6..13ab4c3d853 100644 --- a/pkg/kubelet/dockershim/network/BUILD +++ b/pkg/kubelet/dockershim/network/BUILD @@ -9,7 +9,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim/network", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network/hostport:go_default_library", "//pkg/kubelet/dockershim/network/metrics:go_default_library", diff --git a/pkg/kubelet/dockershim/network/cni/BUILD b/pkg/kubelet/dockershim/network/cni/BUILD index db465fc1334..9396ba84e03 100644 --- a/pkg/kubelet/dockershim/network/cni/BUILD +++ b/pkg/kubelet/dockershim/network/cni/BUILD @@ -15,7 +15,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", "//pkg/util/bandwidth:go_default_library", @@ -37,7 +37,7 @@ go_test( embed = [":go_default_library"], deps = select({ "@io_bazel_rules_go//go/platform:linux": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", diff --git a/pkg/kubelet/dockershim/network/kubenet/BUILD b/pkg/kubelet/dockershim/network/kubenet/BUILD index 4835b7044f1..92613205c5b 100644 --- a/pkg/kubelet/dockershim/network/kubenet/BUILD +++ b/pkg/kubelet/dockershim/network/kubenet/BUILD @@ -16,27 +16,27 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet", deps = select({ "@io_bazel_rules_go//go/platform:android": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:darwin": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:dragonfly": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:freebsd": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", "//pkg/kubelet/dockershim/network/hostport:go_default_library", @@ -57,32 +57,32 @@ go_library( "//vendor/k8s.io/utils/exec:go_default_library", ], "@io_bazel_rules_go//go/platform:nacl": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:netbsd": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:openbsd": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:plan9": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:solaris": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], "@io_bazel_rules_go//go/platform:windows": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", ], @@ -96,7 +96,7 @@ go_test( embed = [":go_default_library"], deps = select({ "@io_bazel_rules_go//go/platform:linux": [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", "//pkg/kubelet/dockershim/network/cni/testing:go_default_library", diff --git a/pkg/kubelet/dockershim/network/testing/BUILD b/pkg/kubelet/dockershim/network/testing/BUILD index c25153a05c7..5fb15b3d46e 100644 --- a/pkg/kubelet/dockershim/network/testing/BUILD +++ b/pkg/kubelet/dockershim/network/testing/BUILD @@ -14,7 +14,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/dockershim/network/testing", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", @@ -31,7 +31,7 @@ go_test( srcs = ["plugins_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/network:go_default_library", "//pkg/util/sysctl/testing:go_default_library", diff --git a/pkg/kubelet/kubeletconfig/BUILD b/pkg/kubelet/kubeletconfig/BUILD index 7ca28a5b794..03e386f8086 100644 --- a/pkg/kubelet/kubeletconfig/BUILD +++ b/pkg/kubelet/kubeletconfig/BUILD @@ -14,8 +14,8 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/kubeletconfig", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/validation:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/validation:go_default_library", "//pkg/kubelet/kubeletconfig/checkpoint:go_default_library", "//pkg/kubelet/kubeletconfig/checkpoint/store:go_default_library", "//pkg/kubelet/kubeletconfig/status:go_default_library", diff --git a/pkg/kubelet/kubeletconfig/checkpoint/BUILD b/pkg/kubelet/kubeletconfig/checkpoint/BUILD index dba89e80353..f1c879a51d2 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/BUILD +++ b/pkg/kubelet/kubeletconfig/checkpoint/BUILD @@ -33,9 +33,9 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/kubeletconfig/status:go_default_library", "//pkg/kubelet/kubeletconfig/util/codec:go_default_library", "//pkg/kubelet/kubeletconfig/util/log:go_default_library", diff --git a/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD b/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD index 1fb7d2d9814..e04c8a21594 100644 --- a/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD +++ b/pkg/kubelet/kubeletconfig/checkpoint/store/BUILD @@ -14,9 +14,9 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/kubeletconfig/checkpoint:go_default_library", "//pkg/kubelet/kubeletconfig/util/codec:go_default_library", "//pkg/kubelet/kubeletconfig/util/files:go_default_library", @@ -38,7 +38,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/store", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/kubeletconfig/checkpoint:go_default_library", "//pkg/kubelet/kubeletconfig/configfiles:go_default_library", "//pkg/kubelet/kubeletconfig/util/files:go_default_library", diff --git a/pkg/kubelet/kubeletconfig/configfiles/BUILD b/pkg/kubelet/kubeletconfig/configfiles/BUILD index 306986c5bbd..ac9f7296592 100644 --- a/pkg/kubelet/kubeletconfig/configfiles/BUILD +++ b/pkg/kubelet/kubeletconfig/configfiles/BUILD @@ -11,8 +11,8 @@ go_library( srcs = ["configfiles.go"], importpath = "k8s.io/kubernetes/pkg/kubelet/kubeletconfig/configfiles", deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", "//pkg/kubelet/kubeletconfig/util/codec:go_default_library", "//pkg/util/filesystem:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", @@ -37,9 +37,9 @@ go_test( srcs = ["configfiles_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/kubeletconfig/util/files:go_default_library", "//pkg/kubelet/kubeletconfig/util/test:go_default_library", "//pkg/util/filesystem:go_default_library", diff --git a/pkg/kubelet/kubeletconfig/util/codec/BUILD b/pkg/kubelet/kubeletconfig/util/codec/BUILD index 9fc785dcc25..c97d1d49b32 100644 --- a/pkg/kubelet/kubeletconfig/util/codec/BUILD +++ b/pkg/kubelet/kubeletconfig/util/codec/BUILD @@ -12,8 +12,8 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/scheme:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/scheme:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index 7c14e9adc4d..4460f873688 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -19,7 +19,7 @@ go_library( "//cmd/kubelet/app/options:go_default_library", "//pkg/controller:go_default_library", "//pkg/kubelet:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container/testing:go_default_library", diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index b7f6baa3264..a0ebaaf3c2c 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -63,7 +63,7 @@ go_library( "//pkg/controller/service:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/dockershim/metrics:go_default_library", "//pkg/kubelet/events:go_default_library", diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 78b024e0656..784e325b35e 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -22,11 +22,11 @@ go_library( deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/features:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", "//pkg/kubelet/apis/deviceplugin/v1beta1:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/devicemanager:go_default_library", @@ -111,9 +111,9 @@ go_test( "//pkg/apis/core:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/cri:go_default_library", "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/cpumanager:go_default_library", diff --git a/test/e2e_node/services/BUILD b/test/e2e_node/services/BUILD index 17b2dc92770..b032c9d9336 100644 --- a/test/e2e_node/services/BUILD +++ b/test/e2e_node/services/BUILD @@ -25,8 +25,8 @@ go_library( "//cmd/kubelet/app/options:go_default_library", "//pkg/controller/namespace:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubelet/apis/kubeletconfig:go_default_library", - "//pkg/kubelet/apis/kubeletconfig/v1beta1:go_default_library", + "//pkg/kubelet/apis/config:go_default_library", + "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/kubeletconfig/util/codec: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",