Skip to content

K
k3s
Commit facd8617 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #21505 from bprashanth/flannel-etcd

Auto commit by PR queue bot
parents 2e3053a2 1e3db8ef
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
cluster/saltbase/salt/flannel-server/flannel-server.manifest
View file @ facd8617
......@@ -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": [
......
cluster/saltbase/salt/flannel-server/init.sls
View file @ facd8617
......@@ -27,5 +27,3 @@ touch /var/log/etcd_flannel.log:
etcd_port: 4003
etcd_peer_port: 2382
cpulimit: '"100m"'
memlimit: '"50Mi"'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment