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
8367d5e0
Commit
8367d5e0
authored
Sep 19, 2018
by
Marian Lobur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract cpu requests to separate env variables.
parent
ecbc4a3a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+6
-0
kube-controller-manager.manifest
cluster/gce/manifests/kube-controller-manager.manifest
+1
-1
kube-scheduler.manifest
cluster/gce/manifests/kube-scheduler.manifest
+1
-1
No files found.
cluster/gce/gci/configure-helper.sh
View file @
8367d5e0
...
...
@@ -30,6 +30,10 @@ readonly UUID_BLOCK_PREFIX="/dev/disk/by-uuid/google-local-ssds"
readonly
COREDNS_AUTOSCALER
=
"Deployment/coredns"
readonly
KUBEDNS_AUTOSCALER
=
"Deployment/kube-dns"
# Resource requests of master components.
KUBE_CONTROLLER_MANAGER_CPU_REQUEST
=
"
${
KUBE_CONTROLLER_MANAGER_CPU_REQUEST
:-
200m
}
"
KUBE_SCHEDULER_CPU_REQUEST
=
"
${
KUBE_SCHEDULER_CPU_REQUEST
:-
75m
}
"
# Use --retry-connrefused opt only if it's supported by curl.
CURL_RETRY_CONNREFUSED
=
""
if
curl
--help
|
grep
-q
--
'--retry-connrefused'
;
then
...
...
@@ -1979,6 +1983,7 @@ function start-kube-controller-manager {
sed
-i
-e
"s@{{pv_recycler_volume}}@
${
PV_RECYCLER_VOLUME
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{flexvolume_hostpath_mount}}@
${
FLEXVOLUME_HOSTPATH_MOUNT
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{flexvolume_hostpath}}@
${
FLEXVOLUME_HOSTPATH_VOLUME
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cpurequest}}@
${
KUBE_CONTROLLER_MANAGER_CPU_REQUEST
}
@g"
"
${
src_file
}
"
cp
"
${
src_file
}
"
/etc/kubernetes/manifests
}
...
...
@@ -2016,6 +2021,7 @@ function start-kube-scheduler {
sed
-i
-e
"s@{{params}}@
${
params
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{pillar
\[
'kube_docker_registry'
\]
}}@
${
DOCKER_REGISTRY
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{pillar
\[
'kube-scheduler_docker_tag'
\]
}}@
${
kube_scheduler_docker_tag
}
@g"
"
${
src_file
}
"
sed
-i
-e
"s@{{cpurequest}}@
${
KUBE_SCHEDULER_CPU_REQUEST
}
@g"
"
${
src_file
}
"
cp
"
${
src_file
}
"
/etc/kubernetes/manifests
}
...
...
cluster/gce/manifests/kube-controller-manager.manifest
View file @
8367d5e0
...
...
@@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
"resources": {
"requests": {
"cpu": "
200m
"
"cpu": "
{{cpurequest}}
"
}
},
"command": [
...
...
cluster/gce/manifests/kube-scheduler.manifest
View file @
8367d5e0
...
...
@@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"requests": {
"cpu": "
75m
"
"cpu": "
{{cpurequest}}
"
}
},
"command": [
...
...
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