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
aaedbb52
Commit
aaedbb52
authored
Aug 16, 2018
by
Marian Lobur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Decrease CPU requests of master components in two times.
parent
4239729f
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
14 deletions
+14
-14
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+3
-3
cluster-autoscaler.manifest
cluster/gce/manifests/cluster-autoscaler.manifest
+1
-1
e2e-image-puller.manifest
cluster/gce/manifests/e2e-image-puller.manifest
+4
-4
glbc.manifest
cluster/gce/manifests/glbc.manifest
+1
-1
kube-addon-manager.yaml
cluster/gce/manifests/kube-addon-manager.yaml
+1
-1
kube-apiserver.manifest
cluster/gce/manifests/kube-apiserver.manifest
+1
-1
kube-controller-manager.manifest
cluster/gce/manifests/kube-controller-manager.manifest
+1
-1
kube-scheduler.manifest
cluster/gce/manifests/kube-scheduler.manifest
+1
-1
rescheduler.manifest
cluster/gce/manifests/rescheduler.manifest
+1
-1
No files found.
cluster/gce/gci/configure-helper.sh
View file @
aaedbb52
...
...
@@ -1269,7 +1269,7 @@ function prepare-kube-proxy-manifest-variables {
sed
-i
-e
"s@{{container_env}}@
${
container_env
}
@g"
${
src_file
}
sed
-i
-e
"s@{{kube_cache_mutation_detector_env_name}}@
${
kube_cache_mutation_detector_env_name
}
@g"
${
src_file
}
sed
-i
-e
"s@{{kube_cache_mutation_detector_env_value}}@
${
kube_cache_mutation_detector_env_value
}
@g"
${
src_file
}
sed
-i
-e
"s@{{ cpurequest }}@
10
0m@g"
${
src_file
}
sed
-i
-e
"s@{{ cpurequest }}@
5
0m@g"
${
src_file
}
sed
-i
-e
"s@{{api_servers_with_port}}@
${
api_servers
}
@g"
${
src_file
}
sed
-i
-e
"s@{{kubernetes_service_host_env_value}}@
${
KUBERNETES_MASTER_NAME
}
@g"
${
src_file
}
if
[[
-n
"
${
CLUSTER_IP_RANGE
:-}
"
]]
;
then
...
...
@@ -1390,10 +1390,10 @@ function start-etcd-servers {
rm
-f
/etc/init.d/etcd
fi
prepare-log-file /var/log/etcd.log
prepare-etcd-manifest
""
"2379"
"2380"
"
2
00m"
"etcd.manifest"
prepare-etcd-manifest
""
"2379"
"2380"
"
1
00m"
"etcd.manifest"
prepare-log-file /var/log/etcd-events.log
prepare-etcd-manifest
"-events"
"4002"
"2381"
"
10
0m"
"etcd-events.manifest"
prepare-etcd-manifest
"-events"
"4002"
"2381"
"
5
0m"
"etcd-events.manifest"
}
# Calculates the following variables based on env variables, which will be used
...
...
cluster/gce/manifests/cluster-autoscaler.manifest
View file @
aaedbb52
...
...
@@ -44,7 +44,7 @@
],
"resources": {
"requests": {
"cpu": "
10
m",
"cpu": "
5
m",
"memory": "300Mi"
}
},
...
...
cluster/gce/manifests/e2e-image-puller.manifest
View file @
aaedbb52
...
...
@@ -11,9 +11,9 @@ spec:
- name: image-puller
resources:
requests:
cpu:
10
0m
cpu:
5
0m
limits:
cpu:
10
0m
cpu:
5
0m
image: k8s.gcr.io/busybox:1.24
# TODO: Replace this with a go script that pulls in parallel?
# Currently it takes ~5m to pull all e2e images, so this is OK, and
...
...
@@ -90,9 +90,9 @@ spec:
- name: nethealth-check
resources:
requests:
cpu:
10
0m
cpu:
5
0m
limits:
cpu:
10
0m
cpu:
5
0m
image: k8s.gcr.io/kube-nethealth-amd64:1.0
command:
- /bin/sh
...
...
cluster/gce/manifests/glbc.manifest
View file @
aaedbb52
...
...
@@ -39,7 +39,7 @@ spec:
# master components on a single core master.
# TODO: Make resource requirements depend on the size of the cluster
requests:
cpu:
10
m
cpu:
5
m
memory: 50Mi
command:
# TODO: split this out into args when we no longer need to pipe stdout to a file #6428
...
...
cluster/gce/manifests/kube-addon-manager.yaml
View file @
aaedbb52
...
...
@@ -21,7 +21,7 @@ spec:
-
exec /opt/kube-addons.sh 1>>/var/log/kube-addon-manager.log 2>&1
resources
:
requests
:
cpu
:
5
m
cpu
:
3
m
memory
:
50Mi
volumeMounts
:
-
mountPath
:
/etc/kubernetes/
...
...
cluster/gce/manifests/kube-apiserver.manifest
View file @
aaedbb52
...
...
@@ -22,7 +22,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-apiserver:{{pillar['kube-apiserver_docker_tag']}}",
"resources": {
"requests": {
"cpu": "
250
m"
"cpu": "
125
m"
}
},
"command": [
...
...
cluster/gce/manifests/kube-controller-manager.manifest
View file @
aaedbb52
...
...
@@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-controller-manager:{{pillar['kube-controller-manager_docker_tag']}}",
"resources": {
"requests": {
"cpu": "
2
00m"
"cpu": "
1
00m"
}
},
"command": [
...
...
cluster/gce/manifests/kube-scheduler.manifest
View file @
aaedbb52
...
...
@@ -21,7 +21,7 @@
"image": "{{pillar['kube_docker_registry']}}/kube-scheduler:{{pillar['kube-scheduler_docker_tag']}}",
"resources": {
"requests": {
"cpu": "
75
m"
"cpu": "
40
m"
}
},
"command": [
...
...
cluster/gce/manifests/rescheduler.manifest
View file @
aaedbb52
...
...
@@ -22,7 +22,7 @@ spec:
# TODO: Make resource requirements depend on the size of the cluster
resources:
requests:
cpu:
10
m
cpu:
5
m
memory: 100Mi
command:
# TODO: split this out into args when we no longer need to pipe stdout to a file #6428
...
...
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