github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: use the right name for the no validator function

Browse Source
This commit is contained in:
Rafael Fernández López 2019-11-15 16:03:40 +01:00
parent d11374d330
commit d049eb71fa
No known key found for this signature in database
GPG Key ID: 8902294E78418CF9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/componentconfigs/registrations.go
View File

@ -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 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}, AddToSchemeFuncs: []AddToSchemeFunc{kubeproxyconfigv1alpha1.AddToScheme},
DefaulterFunc: DefaultKubeProxyConfiguration, DefaulterFunc: DefaultKubeProxyConfiguration,
ValidateFunc: NoValidator("kubelet"), ValidateFunc: NoValidator("kube-proxy"),
EmptyValue: &kubeproxyconfigv1alpha1.KubeProxyConfiguration{}, EmptyValue: &kubeproxyconfigv1alpha1.KubeProxyConfiguration{},
GetFromInternalConfig: func(cfg *kubeadmapi.ClusterConfiguration) (runtime.Object, bool) { GetFromInternalConfig: func(cfg *kubeadmapi.ClusterConfiguration) (runtime.Object, bool) {
return cfg.ComponentConfigs.KubeProxy, cfg.ComponentConfigs.KubeProxy != nil 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 // 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}, AddToSchemeFuncs: []AddToSchemeFunc{kubeletconfigv1beta1.AddToScheme},
DefaulterFunc: DefaultKubeletConfiguration, DefaulterFunc: DefaultKubeletConfiguration,
ValidateFunc: NoValidator("kube-proxy"), ValidateFunc: NoValidator("kubelet"),
EmptyValue: &kubeletconfigv1beta1.KubeletConfiguration{}, EmptyValue: &kubeletconfigv1beta1.KubeletConfiguration{},
GetFromInternalConfig: func(cfg *kubeadmapi.ClusterConfiguration) (runtime.Object, bool) { GetFromInternalConfig: func(cfg *kubeadmapi.ClusterConfiguration) (runtime.Object, bool) {
return cfg.ComponentConfigs.Kubelet, cfg.ComponentConfigs.Kubelet != nil return cfg.ComponentConfigs.Kubelet, cfg.ComponentConfigs.Kubelet != nil