github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix provider-id bad param in local-up-cluster 

mea culpa .. provider-id should be in kubelet not controller manager
pull/6/head
Davanum Srinivas 2018-01-19 16:46:57 -05:00
parent 630b943e00
commit 23fb34ff5d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/local-up-cluster.sh
View File

@ -610,7 +610,6 @@ function start_controller_manager {
cloud_config_arg="--cloud-provider=external" cloud_config_arg="--cloud-provider=external"
cloud_config_arg+=" --external-cloud-volume-plugin=${CLOUD_PROVIDER}" cloud_config_arg+=" --external-cloud-volume-plugin=${CLOUD_PROVIDER}"
cloud_config_arg+=" --cloud-config=${CLOUD_CONFIG}" cloud_config_arg+=" --cloud-config=${CLOUD_CONFIG}"
cloud_config_arg+=" --provider-id=$(hostname)"
fi fi
CTLRMGR_LOG=${LOG_DIR}/kube-controller-manager.log 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}" cloud_config_arg="--cloud-provider=${CLOUD_PROVIDER} --cloud-config=${CLOUD_CONFIG}"
if [[ "${EXTERNAL_CLOUD_PROVIDER:-}" == "true" ]]; then if [[ "${EXTERNAL_CLOUD_PROVIDER:-}" == "true" ]]; then
cloud_config_arg="--cloud-provider=external" cloud_config_arg="--cloud-provider=external"
cloud_config_arg+=" --provider-id=$(hostname)"
fi fi
mkdir -p "/var/lib/kubelet" &>/dev/null || sudo mkdir -p "/var/lib/kubelet" mkdir -p "/var/lib/kubelet" &>/dev/null || sudo mkdir -p "/var/lib/kubelet"