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

Merge pull request #75994 from mrunalp/fix_unbound_args_array 

Fix older bash failing on unbound array variables
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-02 08:22:48 -07:00 committed by GitHub
parent b1186435eb 8c9b169f17
commit d7d852a3ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,7 +638,7 @@ function start_controller_manager {
--cluster-signing-cert-file="${CLUSTER_SIGNING_CERT_FILE}" \
--cluster-signing-key-file="${CLUSTER_SIGNING_KEY_FILE}" \
--enable-hostpath-provisioner="${ENABLE_HOSTPATH_PROVISIONER}" \
"${node_cidr_args[@]}" \
${node_cidr_args[@]+"${node_cidr_args[@]}"} \
--pvclaimbinder-sync-period="${CLAIM_BINDER_SYNC_PERIOD}" \
--feature-gates="${FEATURE_GATES}" \
"${cloud_config_arg[@]}" \
@ -770,13 +770,13 @@ function start_kubelet {
"--eviction-pressure-transition-period=${EVICTION_PRESSURE_TRANSITION_PERIOD}"
"--pod-manifest-path=${POD_MANIFEST_PATH}"
"--fail-swap-on=${FAIL_SWAP_ON}"
"${auth_args[@]}"
"${dns_args[@]}"
"${cni_conf_dir_args[@]}"
"${cni_bin_dir_args[@]}"
"${net_plugin_args[@]}"
"${container_runtime_endpoint_args[@]}"
"${image_service_endpoint_args[@]}"
${auth_args[@]+"${auth_args[@]}"}
${dns_args[@]+"${dns_args[@]}"}
${cni_conf_dir_args[@]+"${cni_conf_dir_args[@]}"}
${cni_bin_dir_args[@]+"${cni_bin_dir_args[@]}"}
${net_plugin_args[@]+"${net_plugin_args[@]}"}
${container_runtime_endpoint_args[@]+"${container_runtime_endpoint_args[@]}"}
${image_service_endpoint_args[@]+"${image_service_endpoint_args[@]}"}
"--port=${KUBELET_PORT}"
${KUBELET_FLAGS}
)