Skip to content

Commit eb2d1fd

Browse files
authored
Merge pull request kubernetes#87914 from RainbowMango/pr_support_providerid
Support config kubelet provider id for local cluster
2 parents c5d7574 + 99c15d2 commit eb2d1fd

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
@@ -78,6 +78,7 @@ EXTERNAL_CLOUD_PROVIDER_BINARY=${EXTERNAL_CLOUD_PROVIDER_BINARY:-""}
7878
EXTERNAL_CLOUD_VOLUME_PLUGIN=${EXTERNAL_CLOUD_VOLUME_PLUGIN:-""}
7979
CLOUD_PROVIDER=${CLOUD_PROVIDER:-""}
8080
CLOUD_CONFIG=${CLOUD_CONFIG:-""}
81+
KUBELET_PROVIDER_ID=${KUBELET_PROVIDER_ID:-"$(hostname)"}
8182
FEATURE_GATES=${FEATURE_GATES:-"AllAlpha=false"}
8283
STORAGE_BACKEND=${STORAGE_BACKEND:-"etcd3"}
8384
STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-"application/vnd.kubernetes.protobuf"}
@@ -702,7 +703,7 @@ function start_kubelet {
702703
if [[ "${CLOUD_PROVIDER:-}" == "aws" ]]; then
703704
cloud_config_arg+=("--provider-id=$(curl http://169.254.169.254/latest/meta-data/instance-id)")
704705
else
705-
cloud_config_arg+=("--provider-id=$(hostname)")
706+
cloud_config_arg+=("--provider-id=${KUBELET_PROVIDER_ID}")
706707
fi
707708
fi
708709

0 commit comments

Comments
 (0)