From d049eb71fa543aa366c07b5847558e4d60a77234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 15 Nov 2019 16:03:40 +0100 Subject: [PATCH] kubeadm: use the right name for the no validator function --- cmd/kubeadm/app/componentconfigs/registrations.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/componentconfigs/registrations.go b/cmd/kubeadm/app/componentconfigs/registrations.go index f4d5afe04e8..4f516adf325 100644 --- a/cmd/kubeadm/app/componentconfigs/registrations.go +++ b/cmd/kubeadm/app/componentconfigs/registrations.go @@ -94,7 +94,7 @@ var Known Registrations = map[RegistrationKind]Registration{ // AddToSchemeFuncs must use v1alpha1scheme defined in k8s.io/kubernetes, because the schema defined in k8s.io/kube-proxy doesn't have defaulting functions AddToSchemeFuncs: []AddToSchemeFunc{kubeproxyconfigv1alpha1.AddToScheme}, DefaulterFunc: DefaultKubeProxyConfiguration, - ValidateFunc: NoValidator("kubelet"), + ValidateFunc: NoValidator("kube-proxy"), EmptyValue: &kubeproxyconfigv1alpha1.KubeProxyConfiguration{}, GetFromInternalConfig: func(cfg *kubeadmapi.ClusterConfiguration) (runtime.Object, bool) { return cfg.ComponentConfigs.KubeProxy, cfg.ComponentConfigs.KubeProxy != nil @@ -113,7 +113,7 @@ var Known Registrations = map[RegistrationKind]Registration{ // PAddToSchemeFuncs must use v1alpha1scheme defined in k8s.io/kubernetes, because the schema defined in k8s.io/kubelet doesn't have defaulting functions AddToSchemeFuncs: []AddToSchemeFunc{kubeletconfigv1beta1.AddToScheme}, DefaulterFunc: DefaultKubeletConfiguration, - ValidateFunc: NoValidator("kube-proxy"), + ValidateFunc: NoValidator("kubelet"), EmptyValue: &kubeletconfigv1beta1.KubeletConfiguration{}, GetFromInternalConfig: func(cfg *kubeadmapi.ClusterConfiguration) (runtime.Object, bool) { return cfg.ComponentConfigs.Kubelet, cfg.ComponentConfigs.Kubelet != nil