Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
88da5685
Unverified
Commit
88da5685
authored
May 30, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
May 30, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #78406 from losipiuk/lo/split-args-ca
Split CA paramters on manifest template expansions
parents
180acb31
dda5e49c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+7
-1
cluster-autoscaler.manifest
cluster/gce/manifests/cluster-autoscaler.manifest
+1
-1
No files found.
cluster/gce/gci/configure-helper.sh
View file @
88da5685
...
@@ -2164,7 +2164,13 @@ function start-cluster-autoscaler {
...
@@ -2164,7 +2164,13 @@ function start-cluster-autoscaler {
local
params
=
"
${
AUTOSCALER_MIG_CONFIG
}
${
CLOUD_CONFIG_OPT
}
${
AUTOSCALER_EXPANDER_CONFIG
:-
--expander=price
}
"
local
params
=
"
${
AUTOSCALER_MIG_CONFIG
}
${
CLOUD_CONFIG_OPT
}
${
AUTOSCALER_EXPANDER_CONFIG
:-
--expander=price
}
"
params+
=
" --kubeconfig=/etc/srv/kubernetes/cluster-autoscaler/kubeconfig"
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_mount}}@
${
CLOUD_CONFIG_MOUNT
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cloud_config_volume}}@
${
CLOUD_CONFIG_VOLUME
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cloud_config_volume}}@
${
CLOUD_CONFIG_VOLUME
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{%.*%}@@g"
"
${
src_file
}
"
sed
-i
-e
"s@{%.*%}@@g"
"
${
src_file
}
"
...
...
cluster/gce/manifests/cluster-autoscaler.manifest
View file @
88da5685
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
"--write-status-configmap=true",
"--write-status-configmap=true",
"--balance-similar-node-groups=true",
"--balance-similar-node-groups=true",
"--expendable-pods-priority-cutoff=-10",
"--expendable-pods-priority-cutoff=-10",
"{{params}}"
{{params}}
],
],
"env": [
"env": [
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment