mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-09 20:17:41 +00:00
Merge pull request #120389 from aojea/external_provider_test
Don't run the nodeipam controller on KCM if cloud provider external
This commit is contained in:
commit
6fa2df07d6
@ -553,6 +553,11 @@ export TLS_CIPHER_SUITES=""
|
|||||||
# and kubelet
|
# and kubelet
|
||||||
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-external}"
|
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-external}"
|
||||||
|
|
||||||
|
# Don't run the node-ipam-controller on the KCM if cloud-provider external
|
||||||
|
if [[ "${CLOUD_PROVIDER_FLAG}" == "external" ]]; then
|
||||||
|
RUN_CONTROLLERS="${RUN_CONTROLLERS:-*,-node-ipam-controller}"
|
||||||
|
fi
|
||||||
|
|
||||||
# When ENABLE_AUTH_PROVIDER_GCP is set, following flags for out-of-tree credential provider for GCP
|
# When ENABLE_AUTH_PROVIDER_GCP is set, following flags for out-of-tree credential provider for GCP
|
||||||
# are presented to kubelet:
|
# are presented to kubelet:
|
||||||
# --image-credential-provider-config=${path-to-config}
|
# --image-credential-provider-config=${path-to-config}
|
||||||
|
@ -602,6 +602,11 @@ export TLS_CIPHER_SUITES=""
|
|||||||
# and kubelet
|
# and kubelet
|
||||||
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-external}"
|
export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-external}"
|
||||||
|
|
||||||
|
# Don't run the node-ipam-controller on the KCM if cloud-provider external
|
||||||
|
if [[ "${CLOUD_PROVIDER_FLAG}" == "external" ]]; then
|
||||||
|
RUN_CONTROLLERS="${RUN_CONTROLLERS:-*,-node-ipam-controller}"
|
||||||
|
fi
|
||||||
|
|
||||||
# When ENABLE_AUTH_PROVIDER_GCP is set, following flags for out-of-tree credential provider for GCP
|
# When ENABLE_AUTH_PROVIDER_GCP is set, following flags for out-of-tree credential provider for GCP
|
||||||
# are presented to kubelet:
|
# are presented to kubelet:
|
||||||
# --image-credential-provider-config=${path-to-config}
|
# --image-credential-provider-config=${path-to-config}
|
||||||
|
Loading…
Reference in New Issue
Block a user