github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Do not set CNI on a private master when enabling network policy.

Browse Source
This commit is contained in:
Daniel Nardo 2017-06-23 16:16:23 -07:00
parent 3fd593aa2d
commit 00b62df554
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/gci/configure-helper.sh
View File

@ -912,7 +912,11 @@ function start-kubelet {
flags+=" --cni-bin-dir=/home/kubernetes/bin" flags+=" --cni-bin-dir=/home/kubernetes/bin"
if [[ "${NETWORK_POLICY_PROVIDER:-}" == "calico" ]]; then if [[ "${NETWORK_POLICY_PROVIDER:-}" == "calico" ]]; then
# Calico uses CNI always. # Calico uses CNI always.
flags+=" --network-plugin=cni" if [[ "${KUBERNETES_PRIVATE_MASTER:-}" == "true" ]]; then
flags+=" --network-plugin=${NETWORK_PROVIDER}"
else
flags+=" --network-plugin=cni"
fi
else else
# Otherwise use the configured value. # Otherwise use the configured value.
flags+=" --network-plugin=${NETWORK_PROVIDER}" flags+=" --network-plugin=${NETWORK_PROVIDER}"