diff --git a/cluster/saltbase/salt/flannel-server/flannel-server.manifest b/cluster/saltbase/salt/flannel-server/flannel-server.manifest index fb9bd6482d2..c679f2123df 100644 --- a/cluster/saltbase/salt/flannel-server/flannel-server.manifest +++ b/cluster/saltbase/salt/flannel-server/flannel-server.manifest @@ -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": [ diff --git a/cluster/saltbase/salt/flannel-server/init.sls b/cluster/saltbase/salt/flannel-server/init.sls index 749670b601e..5712fea08f9 100644 --- a/cluster/saltbase/salt/flannel-server/init.sls +++ b/cluster/saltbase/salt/flannel-server/init.sls @@ -27,5 +27,3 @@ touch /var/log/etcd_flannel.log: etcd_port: 4003 etcd_peer_port: 2382 cpulimit: '"100m"' - memlimit: '"50Mi"' -