Skip to content

Commit 1bfced5

Browse files
authored
Merge pull request kubernetes#120392 from dims/set-external-credential-provider-to-true-by-default-in-kube-up.sh
Set external credential provider to true by default in kube-up.sh
2 parents 6fa2df0 + 3f8f143 commit 1bfced5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cluster/gce/config-default.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,4 +564,4 @@ fi
564564
# --image-credential-provider-bin-dir=${path-to-auth-provider-binary}
565565
# Also, it is required that DisableKubeletCloudCredentialProviders
566566
# feature gates are set to true for kubelet to use external credential provider.
567-
export ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-false}"
567+
export ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-true}"

cluster/gce/config-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,4 +613,4 @@ fi
613613
# --image-credential-provider-bin-dir=${path-to-auth-provider-binary}
614614
# Also, it is required that DisableKubeletCloudCredentialProviders and KubeletCredentialProviders
615615
# feature gates are set to true for kubelet to use external credential provider.
616-
export ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-false}"
616+
export ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-true}"

cluster/gce/util.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ function construct-linux-kubelet-flags {
770770
# If ENABLE_AUTH_PROVIDER_GCP is set to true, kubelet is enabled to use out-of-tree auth
771771
# credential provider instead of in-tree auth credential provider.
772772
# https://kubernetes.io/docs/tasks/kubelet-credential-provider/kubelet-credential-provider
773-
if [[ "${ENABLE_AUTH_PROVIDER_GCP:-false}" == "true" ]]; then
773+
if [[ "${ENABLE_AUTH_PROVIDER_GCP:-true}" == "true" ]]; then
774774
# Keep the values of --image-credential-provider-config and --image-credential-provider-bin-dir
775775
# in sync with value of auth_config_file and auth_provider_dir set in install-auth-provider-gcp function
776776
# in gci/configure.sh.
@@ -882,7 +882,7 @@ function construct-windows-kubelet-flags {
882882

883883
# If ENABLE_AUTH_PROVIDER_GCP is set to true, kubelet is enabled to use out-of-tree auth
884884
# credential provider. https://kubernetes.io/docs/tasks/kubelet-credential-provider/kubelet-credential-provider
885-
if [[ "${ENABLE_AUTH_PROVIDER_GCP:-false}" == "true" ]]; then
885+
if [[ "${ENABLE_AUTH_PROVIDER_GCP:-true}" == "true" ]]; then
886886
flags+=" --image-credential-provider-config=${AUTH_PROVIDER_GCP_WINDOWS_CONF_FILE}"
887887
flags+=" --image-credential-provider-bin-dir=${AUTH_PROVIDER_GCP_WINDOWS_BIN_DIR}"
888888
fi
@@ -1127,7 +1127,7 @@ METADATA_AGENT_CLUSTER_LEVEL_MEMORY_REQUEST: $(yaml-quote "${METADATA_AGENT_CLUS
11271127
DOCKER_REGISTRY_MIRROR_URL: $(yaml-quote "${DOCKER_REGISTRY_MIRROR_URL:-}")
11281128
ENABLE_L7_LOADBALANCING: $(yaml-quote "${ENABLE_L7_LOADBALANCING:-none}")
11291129
ENABLE_CLUSTER_LOGGING: $(yaml-quote "${ENABLE_CLUSTER_LOGGING:-false}")
1130-
ENABLE_AUTH_PROVIDER_GCP: $(yaml-quote "${ENABLE_AUTH_PROVIDER_GCP:-false}")
1130+
ENABLE_AUTH_PROVIDER_GCP: $(yaml-quote "${ENABLE_AUTH_PROVIDER_GCP:-true}")
11311131
ENABLE_NODE_PROBLEM_DETECTOR: $(yaml-quote "${ENABLE_NODE_PROBLEM_DETECTOR:-none}")
11321132
NODE_PROBLEM_DETECTOR_VERSION: $(yaml-quote "${NODE_PROBLEM_DETECTOR_VERSION:-}")
11331133
NODE_PROBLEM_DETECTOR_TAR_HASH: $(yaml-quote "${NODE_PROBLEM_DETECTOR_TAR_HASH:-}")

0 commit comments

Comments
 (0)