Skip to content

Commit 405714b

Browse files
authored
Merge pull request kubernetes#86870 from RainbowMango/pr_support_external_cloud_provider
Fix local cluster do not work with non-intree external cloud provider issue
2 parents e7eed1a + eb07476 commit 405714b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

hack/local-up-cluster.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ EXTERNAL_CLOUD_PROVIDER=${EXTERNAL_CLOUD_PROVIDER:-false}
7676
EXTERNAL_CLOUD_PROVIDER_BINARY=${EXTERNAL_CLOUD_PROVIDER_BINARY:-""}
7777
CLOUD_PROVIDER=${CLOUD_PROVIDER:-""}
7878
CLOUD_CONFIG=${CLOUD_CONFIG:-""}
79+
EXTERNAL_CLOUD_VOLUME_PLUGIN=${EXTERNAL_CLOUD_VOLUME_PLUGIN:-"${CLOUD_PROVIDER}"}
7980
FEATURE_GATES=${FEATURE_GATES:-"AllAlpha=false"}
8081
STORAGE_BACKEND=${STORAGE_BACKEND:-"etcd3"}
8182
STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-""}
@@ -615,7 +616,7 @@ function start_controller_manager {
615616
cloud_config_arg=("--cloud-provider=${CLOUD_PROVIDER}" "--cloud-config=${CLOUD_CONFIG}")
616617
if [[ "${EXTERNAL_CLOUD_PROVIDER:-}" == "true" ]]; then
617618
cloud_config_arg=("--cloud-provider=external")
618-
cloud_config_arg+=("--external-cloud-volume-plugin=${CLOUD_PROVIDER}")
619+
cloud_config_arg+=("--external-cloud-volume-plugin=${EXTERNAL_CLOUD_VOLUME_PLUGIN}")
619620
cloud_config_arg+=("--cloud-config=${CLOUD_CONFIG}")
620621
fi
621622

0 commit comments

Comments
 (0)