Merge pull request kubernetes-sigs#1494 from BenTheElder/fix-cfg

fix config featuregate handling
rezamt · Apr 17, 2020 · 909e6f7 · 909e6f7
2 parents f277913 + 4cc250d
commit 909e6f7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/cluster/internal/kubeadm/config.go b/pkg/cluster/internal/kubeadm/config.go
@@ -530,6 +530,11 @@ func Config(data ConfigData) (config string, err error) {
 		return "", err
 	}
 
+	// ensure featureGates is non-nil, as we may add entries
+	if data.FeatureGates == nil {
+		data.FeatureGates = make(map[string]bool)
+	}
+
 	// assume the latest API version, then fallback if the k8s version is too low
 	templateSource := ConfigTemplateBetaV2
 	if ver.LessThan(version.MustParseSemantic("v1.12.0")) {