Merge pull request #78406 from losipiuk/lo/split-args-ca

Split CA paramters on manifest template expansions
k3s-v1.15.3
Kubernetes Prow Robot 2019-05-30 00:32:46 -07:00 committed by GitHub
commit 88da568586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -2164,7 +2164,13 @@ function start-cluster-autoscaler {
local params="${AUTOSCALER_MIG_CONFIG} ${CLOUD_CONFIG_OPT} ${AUTOSCALER_EXPANDER_CONFIG:---expander=price}"
params+=" --kubeconfig=/etc/srv/kubernetes/cluster-autoscaler/kubeconfig"
sed -i -e "s@{{params}}@${params}@g" "${src_file}"
# split the params into separate arguments passed to binary
local params_split
params_split=$(eval "for param in $params; do echo -n \\\"\$param\\\",; done")
params_split=${params_split%?}
sed -i -e "s@{{params}}@${params_split}@g" "${src_file}"
sed -i -e "s@{{cloud_config_mount}}@${CLOUD_CONFIG_MOUNT}@g" "${src_file}"
sed -i -e "s@{{cloud_config_volume}}@${CLOUD_CONFIG_VOLUME}@g" "${src_file}"
sed -i -e "s@{%.*%}@@g" "${src_file}"

View File

@ -34,7 +34,7 @@
"--write-status-configmap=true",
"--balance-similar-node-groups=true",
"--expendable-pods-priority-cutoff=-10",
"{{params}}"
{{params}}
],
"env": [
{