Merge pull request #61882 from xiangpengzhao/fix-changelog

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add note on upgrading cluster by kubeadm. **What this PR does / why we need it**: Upgrading cluster from 1.9.x to 1.10.0 by kubeadm fails due to type change of `featureGates` in `KubeProxyConfiguration` done in #57962. This PR add a note on what should be done before upgrading. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref #61764 **Special notes for your reviewer**: cc @kubernetes/sig-cluster-lifecycle-bugs @liggitt @fgbreel Thanks @berlinsaint for the workaround! We may need a patch (if possible) for kubeadm to do this automatically as suggested by @danderson . **Release note**: ```release-note NONE ```

Merge pull request #61882 from xiangpengzhao/fix-changelog
c1a6d554 · Kubernetes Submit Queue · GitHub · 046baee8 · 43b0f585 · c1a6d554
Unverified Commit c1a6d554 authored Apr 25, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 0 deletions

CHANGELOG-1.10.md CHANGELOG-1.10.md +33 -0

No files found.
--- a/CHANGELOG-1.10.md
+++ b/CHANGELOG-1.10.md
@@ -320,6 +320,39 @@ kind: KubeProxyConfiguration
 **  SupportIPVSProxyMode: true**
 ```

+If your cluster was installed by kubeadm, you should edit the `featureGates` field in the `kubeadm-config` ConfigMap. You can do this using `kubectl -n kube-system edit cm kubeadm-config` before upgrading. For example:
+
+kubeadm-config Before:
+
+```
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubeadm-config
+data:
+  MasterConfiguration: |
+    kubeProxy:
+      config:
+        featureGates: "SupportIPVSProxyMode=true"
+```
+
+kubeadm-config After:
+
+```
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubeadm-config
+data:
+  MasterConfiguration: |
+    kubeProxy:
+      config:
+        featureGates:
+          SupportIPVSProxyMode: true
+```
+
+If no featureGates was specified in `kubeadm-config`, just change `featureGates: ""` to `featureGates: {}`.
+
 ([#57962](https://github.com/kubernetes/kubernetes/pull/57962), [@xiangpengzhao](https://github.com/xiangpengzhao))

 * The `kubeletconfig` API group has graduated from alpha to beta, and the name has changed to `kubelet.config.k8s.io`. Please use `kubelet.config.k8s.io/v1beta1`, as `kubeletconfig/v1alpha1` is no longer available.  ([#53833](https://github.com/kubernetes/kubernetes/pull/53833), [@mtaufen](https://github.com/mtaufen))