github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21505 from bprashanth/flannel-etcd

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-21 18:09:12 -08:00
commit facd8617ce
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/saltbase/salt/flannel-server/flannel-server.manifest
View File

@ -60,8 +60,8 @@
} }
], ],
"resources": { "resources": {
"limits": { "requests": {
"cpu": "100m" "cpu": {{ cpulimit }}
} }
}, },
"volumeMounts": [ "volumeMounts": [
@ -89,9 +89,8 @@
"timeoutSeconds": 15 "timeoutSeconds": 15
}, },
"resources": { "resources": {
"limits": { "requests": {
"cpu": {{ cpulimit }}, "cpu": {{ cpulimit }}
"memory": {{ memlimit }}
} }
}, },
"volumeMounts": [ "volumeMounts": [

2
cluster/saltbase/salt/flannel-server/init.sls
View File

@ -27,5 +27,3 @@ touch /var/log/etcd_flannel.log:
etcd_port: 4003 etcd_port: 4003
etcd_peer_port: 2382 etcd_peer_port: 2382
cpulimit: '"100m"' cpulimit: '"100m"'
memlimit: '"50Mi"'