mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #21505 from bprashanth/flannel-etcd
Auto commit by PR queue bot
This commit is contained in:
commit
facd8617ce
@ -60,8 +60,8 @@
|
||||
}
|
||||
],
|
||||
"resources": {
|
||||
"limits": {
|
||||
"cpu": "100m"
|
||||
"requests": {
|
||||
"cpu": {{ cpulimit }}
|
||||
}
|
||||
},
|
||||
"volumeMounts": [
|
||||
@ -89,9 +89,8 @@
|
||||
"timeoutSeconds": 15
|
||||
},
|
||||
"resources": {
|
||||
"limits": {
|
||||
"cpu": {{ cpulimit }},
|
||||
"memory": {{ memlimit }}
|
||||
"requests": {
|
||||
"cpu": {{ cpulimit }}
|
||||
}
|
||||
},
|
||||
"volumeMounts": [
|
||||
|
@ -27,5 +27,3 @@ touch /var/log/etcd_flannel.log:
|
||||
etcd_port: 4003
|
||||
etcd_peer_port: 2382
|
||||
cpulimit: '"100m"'
|
||||
memlimit: '"50Mi"'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user