Skip to content

Commit 5935fcd

Browse files
authored
Merge pull request kubernetes#95766 from towca/jtuznik/ca-params-fix
Properly quote flags passed to Cluster Autoscaler
2 parents 1f756e4 + 236ade0 commit 5935fcd

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

cluster/gce/gci/configure-helper.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2155,12 +2155,14 @@ function start-cluster-autoscaler {
21552155
# Remove salt comments and replace variables with values
21562156
local -r src_file="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/cluster-autoscaler.manifest"
21572157

2158-
local params=("${AUTOSCALER_MIG_CONFIG}" "${CLOUD_CONFIG_OPT}" "${AUTOSCALER_EXPANDER_CONFIG:---expander=price}")
2158+
local params
2159+
read -r -a params <<< "${AUTOSCALER_MIG_CONFIG}"
2160+
params+=("${CLOUD_CONFIG_OPT}" "${AUTOSCALER_EXPANDER_CONFIG:---expander=price}")
21592161
params+=("--kubeconfig=/etc/srv/kubernetes/cluster-autoscaler/kubeconfig")
21602162

21612163
# split the params into separate arguments passed to binary
21622164
local params_split
2163-
params_split=$(eval 'for param in "${params[@]}"; do echo -n "$param",; done')
2165+
params_split=$(eval 'for param in "${params[@]}"; do echo -n \""$param"\",; done')
21642166
params_split=${params_split%?}
21652167

21662168
sed -i -e "s@{{params}}@${params_split}@g" "${src_file}"

0 commit comments

Comments
 (0)