Standardize on KUBE_PROXY_MODE (not KUBEPROXY_MODE)

There's a disconnect between 12d4eac0 and the earlier a6af8278. One says KUBEPROXY_MODE and another says KUBE_PROXY_MODE. Let's just pick one. Currently we fail with the following error: hack/local-up-cluster.sh: line 808: KUBEPROXY_MODE: unbound variable

Standardize on KUBE_PROXY_MODE (not KUBEPROXY_MODE)
692f2ec3 · Davanum Srinivas · 6535c955 · 692f2ec3 · 692f2ec3
Commit 692f2ec3 authored Feb 14, 2018 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

local-up-cluster.sh hack/local-up-cluster.sh +3 -3

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

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -121,7 +121,7 @@ if [ "${CLOUD_PROVIDER}" == "openstack" ]; then
 fi

 # set feature gates if using ipvs mode
-if [ "${KUBEPROXY_MODE}" == "ipvs" ]; then
+if [ "${KUBE_PROXY_MODE}" == "ipvs" ]; then
    FEATURE_GATES="$FEATURE_GATES,SupportIPVSProxyMode=true"
 fi

@@ -811,9 +811,9 @@ clientConnection:
  kubeconfig: ${CERT_DIR}/kube-proxy.kubeconfig
 hostnameOverride: ${HOSTNAME_OVERRIDE}
 featureGates: ${FEATURE_GATES}
-mode: ${KUBEPROXY_MODE}
+mode: ${KUBE_PROXY_MODE}
 EOF
-    if [ "${KUBEPROXY_MODE}" == "ipvs" ]; then
+    if [ "${KUBE_PROXY_MODE}" == "ipvs" ]; then
 	# Load kernel modules required by IPVS proxier
        sudo modprobe -a ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack_ipv4
    fi

--- a/pkg/proxy/ipvs/README.md
+++ b/pkg/proxy/ipvs/README.md
@@ -18,7 +18,7 @@ Currently, local-up scripts and kubeadm support switching IPVS proxy mode via ex

 Kube-proxy will run in iptables mode by default in a [local-up cluster](https://github.com/kubernetes/community/blob/master/contributors/devel/running-locally.md). 

-Users should export the env `KUBEPROXY_MODE=ipvs` to specify the ipvs mode before deploying the cluster if want to run kube-proxy in ipvs mode.
+Users should export the env `KUBE_PROXY_MODE=ipvs` to specify the ipvs mode before deploying the cluster if want to run kube-proxy in ipvs mode.

 ### Cluster Created by Kubeadm