Merge pull request #68075 from riverzhang/fix-ipvs-readme

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Fix how to use ipvs mode by kubeadm **What this PR does / why we need it**: how to use ipvs mode by kubeadm **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```

Merge pull request #68075 from riverzhang/fix-ipvs-readme
ef741c30 · Kubernetes Submit Queue · GitHub · 2548fb08 · 4f6b5734 · ef741c30
Unverified Commit ef741c30 authored Aug 31, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

README.md pkg/proxy/ipvs/README.md +5 -5

No files found.
--- a/pkg/proxy/ipvs/README.md
+++ b/pkg/proxy/ipvs/README.md
@@ -334,19 +334,19 @@ export KUBE_PROXY_MODE=ipvs

 ### Cluster Created by Kubeadm

-Kube-proxy will run in iptables mode by default in a cluster deployed by [kubeadm](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/).
-
-If you are using kubeadm with a [configuration file](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file), you can specify the ipvs mode adding `SupportIPVSProxyMode: true` below the `kubeProxy` field.
+If you are using kubeadm with a [configuration file](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file), you have to add `mode: ipvs` and also add `SupportIPVSProxyMode: true` below the `kubeProxy` field as part of the kubeadm configuration.

 ```json
-kind: MasterConfiguration
-apiVersion: kubeadm.k8s.io/v1alpha1
 ...
 kubeProxy:
  config:
+    featureGates:
+      SupportIPVSProxyMode: true
    mode: ipvs
 ...
 ```
+Note that in Kubernetes 1.11 and later, `SupportIPVSProxyMode` is set to `true` by default.
+
 before running

 `kube init --config <path_to_configuration_file>`