github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 20:21:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82929 from 41tair/master

Browse Source 
fix map assignment to entry in nil map,when use --feature-gates in kubeadm
This commit is contained in:
Kubernetes Prow Robot
2019-09-22 12:53:22 -07:00
committed by GitHub
parent 338a09abd2 23b75cfcad
commit 8f9fcaf727
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/componentconfigs/defaults.go
View File

@@ -58,7 +58,7 @@ const (
// DefaultKubeProxyConfiguration assigns default values for the kube-proxy ComponentConfig
func DefaultKubeProxyConfiguration(internalcfg *kubeadmapi.ClusterConfiguration) {
externalproxycfg := &kubeproxyconfigv1alpha1.KubeProxyConfiguration{}
externalproxycfg := &kubeproxyconfigv1alpha1.KubeProxyConfiguration{FeatureGates: make(map[string]bool)}
kind := "KubeProxyConfiguration"
// Do a roundtrip to the external version for defaulting