mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 03:11:40 +00:00
Merge pull request #58543 from dims/fix-bad-param-provider-id
Automatic merge from submit-queue (batch tested with PRs 58300, 58530, 57942, 58543). 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>. fix provider-id bad param in local-up-cluster **What this PR does / why we need it**: mea culpa .. provider-id should be in kubelet not controller manager **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 ```
This commit is contained in:
commit
7ba13c26d1
@ -610,7 +610,6 @@ function start_controller_manager {
|
||||
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
|
||||
@ -674,6 +673,7 @@ function start_kubelet {
|
||||
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+=" --provider-id=$(hostname)"
|
||||
fi
|
||||
|
||||
mkdir -p "/var/lib/kubelet" &>/dev/null || sudo mkdir -p "/var/lib/kubelet"
|
||||
|
Loading…
Reference in New Issue
Block a user