From 781f86d18ceaaccfe7a58e7eab6ddaddc0f42b1a Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Mon, 2 Nov 2020 14:57:39 -0500 Subject: [PATCH 1/2] deploy: add memory limits This is the beginning of a change to add cpu/memory limits to our pods. We are doing this because some consumers require this, and it is generally a good practice. The limits == requests for "Guaranteed" QoS. Signed-off-by: Andrew Keesler --- deploy/concierge/deployment.yaml | 2 ++ deploy/supervisor/deployment.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deploy/concierge/deployment.yaml b/deploy/concierge/deployment.yaml index d8e8c0719..531371693 100644 --- a/deploy/concierge/deployment.yaml +++ b/deploy/concierge/deployment.yaml @@ -102,6 +102,8 @@ spec: resources: requests: memory: "128Mi" + limits: + memory: "128Mi" args: - --config=/etc/config/pinniped.yaml - --downward-api-path=/etc/podinfo diff --git a/deploy/supervisor/deployment.yaml b/deploy/supervisor/deployment.yaml index 8f91610d3..788645f08 100644 --- a/deploy/supervisor/deployment.yaml +++ b/deploy/supervisor/deployment.yaml @@ -81,6 +81,8 @@ spec: resources: requests: memory: "128Mi" + limits: + memory: "128Mi" volumeMounts: - name: config-volume mountPath: /etc/config From 05233963fb4b9a9332b8893ec45b245962c85000 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Mon, 2 Nov 2020 15:47:20 -0800 Subject: [PATCH 2/2] Add CPU requests and limits to the Concierge and Supervisor deployments --- deploy/concierge/deployment.yaml | 2 ++ deploy/supervisor/deployment.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/deploy/concierge/deployment.yaml b/deploy/concierge/deployment.yaml index 531371693..47e002610 100644 --- a/deploy/concierge/deployment.yaml +++ b/deploy/concierge/deployment.yaml @@ -101,8 +101,10 @@ spec: imagePullPolicy: IfNotPresent resources: requests: + cpu: "100m" memory: "128Mi" limits: + cpu: "100m" memory: "128Mi" args: - --config=/etc/config/pinniped.yaml diff --git a/deploy/supervisor/deployment.yaml b/deploy/supervisor/deployment.yaml index 788645f08..ab67a117e 100644 --- a/deploy/supervisor/deployment.yaml +++ b/deploy/supervisor/deployment.yaml @@ -80,8 +80,10 @@ spec: - /etc/config/pinniped.yaml resources: requests: + cpu: "100m" memory: "128Mi" limits: + cpu: "100m" memory: "128Mi" volumeMounts: - name: config-volume