Merge remote-tracking branch 'origin/master' into release-1.17

femrtnz · Nov 22, 2019 · 663a303 · 663a303
2 parents 4864255 + 3028dc1
commit 663a303
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/cmd/kubeadm/app/componentconfigs/defaults.go b/cmd/kubeadm/app/componentconfigs/defaults.go
@@ -63,6 +63,12 @@ func DefaultKubeProxyConfiguration(internalcfg *kubeadmapi.ClusterConfiguration)
 			FeatureGates: map[string]bool{},
 		}
 	}
+	// The below code is necessary because while KubeProxy may be defined, the user may not
+	// have defined any feature-gates, thus FeatureGates will be nil and the later insertion
+	// of any feature-gates (e.g. IPv6DualStack) will cause a panic.
+	if internalcfg.ComponentConfigs.KubeProxy.FeatureGates == nil {
+		internalcfg.ComponentConfigs.KubeProxy.FeatureGates = map[string]bool{}
+	}
 
 	externalproxycfg := internalcfg.ComponentConfigs.KubeProxy
 

diff --git a/staging/src/k8s.io/component-base/metrics/desc.go b/staging/src/k8s.io/component-base/metrics/desc.go
@@ -119,7 +119,8 @@ func (d *Desc) determineDeprecationStatus(version semver.Version) {
 			return
 		}
 		if shouldHide(&version, selfVersion) {
-			klog.Warningf("This metric(%s) has been deprecated for more than one release, hiding.", d.fqName)
+			// TODO(RainbowMango): Remove this log temporarily. https://github.com/kubernetes/kubernetes/issues/85369
+			// klog.Warningf("This metric(%s) has been deprecated for more than one release, hiding.", d.fqName)
 			d.isHidden = true
 		}
 	})

diff --git a/staging/src/k8s.io/component-base/metrics/metric.go b/staging/src/k8s.io/component-base/metrics/metric.go
@@ -102,7 +102,8 @@ func (r *lazyMetric) determineDeprecationStatus(version semver.Version) {
 			return
 		}
 		if shouldHide(&version, selfVersion) {
-			klog.Warningf("This metric has been deprecated for more than one release, hiding.")
+			// TODO(RainbowMango): Remove this log temporarily. https://github.com/kubernetes/kubernetes/issues/85369
+			// klog.Warningf("This metric has been deprecated for more than one release, hiding.")
 			r.isHidden = true
 		}
 	})