Commit 692f2ec3 authored by Davanum Srinivas's avatar Davanum Srinivas

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
parent 6535c955
...@@ -121,7 +121,7 @@ if [ "${CLOUD_PROVIDER}" == "openstack" ]; then ...@@ -121,7 +121,7 @@ if [ "${CLOUD_PROVIDER}" == "openstack" ]; then
fi fi
# set feature gates if using ipvs mode # set feature gates if using ipvs mode
if [ "${KUBEPROXY_MODE}" == "ipvs" ]; then if [ "${KUBE_PROXY_MODE}" == "ipvs" ]; then
FEATURE_GATES="$FEATURE_GATES,SupportIPVSProxyMode=true" FEATURE_GATES="$FEATURE_GATES,SupportIPVSProxyMode=true"
fi fi
...@@ -811,9 +811,9 @@ clientConnection: ...@@ -811,9 +811,9 @@ clientConnection:
kubeconfig: ${CERT_DIR}/kube-proxy.kubeconfig kubeconfig: ${CERT_DIR}/kube-proxy.kubeconfig
hostnameOverride: ${HOSTNAME_OVERRIDE} hostnameOverride: ${HOSTNAME_OVERRIDE}
featureGates: ${FEATURE_GATES} featureGates: ${FEATURE_GATES}
mode: ${KUBEPROXY_MODE} mode: ${KUBE_PROXY_MODE}
EOF EOF
if [ "${KUBEPROXY_MODE}" == "ipvs" ]; then if [ "${KUBE_PROXY_MODE}" == "ipvs" ]; then
# Load kernel modules required by IPVS proxier # Load kernel modules required by IPVS proxier
sudo modprobe -a ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack_ipv4 sudo modprobe -a ip_vs ip_vs_rr ip_vs_wrr ip_vs_sh nf_conntrack_ipv4
fi fi
......
...@@ -18,7 +18,7 @@ Currently, local-up scripts and kubeadm support switching IPVS proxy mode via ex ...@@ -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). 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 ### Cluster Created by Kubeadm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment