From da971d802039d138de99cc6b1eace1aee9544b42 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Sat, 25 Nov 2017 00:25:37 +0800 Subject: [PATCH] Only set defaults when DynamicKubeletConfig feature gate is on. --- cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go index f621fa0931f..86548a0f0e4 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go @@ -110,7 +110,9 @@ func SetDefaults_MasterConfiguration(obj *MasterConfiguration) { } SetDefaultsEtcdSelfHosted(obj) - SetDefaults_KubeletConfiguration(obj) + if features.Enabled(obj.FeatureGates, features.DynamicKubeletConfig) { + SetDefaults_KubeletConfiguration(obj) + } SetDefaults_ProxyConfiguration(obj) }