Merge pull request #58425 from dims/better-external-cloud-provider-support-in-local-up-cluster

Automatic merge from submit-queue (batch tested with PRs 58263, 58425, 58419). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Enable --external-cloud-volume-plugin/--provider-id for local-up-cluster See the following commit for more information about the --external-cloud-volume-plugin flag: https://github.com/kubernetes/kubernetes/pull/52371/commits/070a7b58237ad12582b3b2eff00877e48324ad66 We need this flag for EXTERNAL_CLOUD_PROVIDER flag to work properly with volume plugins Also add --provider-id defaulting to hostname as we seem to pick up the ip address otherwise causing problem with looking up the node in the cloud provider **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #58425 from dims/better-external-cloud-provider-support-in-local-up-cluster
efdf0d9e · Kubernetes Submit Queue · GitHub · 58560ab4 · f2093f1d · efdf0d9e
Unverified Commit efdf0d9e authored Jan 18, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

local-up-cluster.sh hack/local-up-cluster.sh +3 -0

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -608,6 +608,9 @@ function start_controller_manager {
    cloud_config_arg="--cloud-provider=${CLOUD_PROVIDER} --cloud-config=${CLOUD_CONFIG}"
    if [[ "${EXTERNAL_CLOUD_PROVIDER:-}" == "true" ]]; then
      cloud_config_arg="--cloud-provider=external"
+      cloud_config_arg+=" --external-cloud-volume-plugin=${CLOUD_PROVIDER}"
+      cloud_config_arg+=" --cloud-config=${CLOUD_CONFIG}"
+      cloud_config_arg+=" --provider-id=$(hostname)"
    fi

    CTLRMGR_LOG=${LOG_DIR}/kube-controller-manager.log