Skip to content

Commit 410ac14

Browse files
committed
Don't run the nodeipam controller on KCM if cloud provider external
Change-Id: Ic1da0e9ced2dc8d3d382fee5636bbee18b3a29f7 Signed-off-by: Antonio Ojea <[email protected]>
1 parent ea3353d commit 410ac14

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cluster/gce/config-default.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,11 @@ export TLS_CIPHER_SUITES=""
553553
# and kubelet
554554
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-external}"
555555

556+
# Don't run the node-ipam-controller on the KCM if cloud-provider external
557+
if [[ "${CLOUD_PROVIDER_FLAG}" == "external" ]]; then
558+
RUN_CONTROLLERS="${RUN_CONTROLLERS:-*,-node-ipam-controller}"
559+
fi
560+
556561
# When ENABLE_AUTH_PROVIDER_GCP is set, following flags for out-of-tree credential provider for GCP
557562
# are presented to kubelet:
558563
# --image-credential-provider-config=${path-to-config}

cluster/gce/config-test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,11 @@ export TLS_CIPHER_SUITES=""
602602
# and kubelet
603603
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-external}"
604604

605+
# Don't run the node-ipam-controller on the KCM if cloud-provider external
606+
if [[ "${CLOUD_PROVIDER_FLAG}" == "external" ]]; then
607+
RUN_CONTROLLERS="${RUN_CONTROLLERS:-*,-node-ipam-controller}"
608+
fi
609+
605610
# When ENABLE_AUTH_PROVIDER_GCP is set, following flags for out-of-tree credential provider for GCP
606611
# are presented to kubelet:
607612
# --image-credential-provider-config=${path-to-config}

0 commit comments

Comments
 (0)