From c11e8e24edee1aebff9eaf4ee5b8b2f0277cfebf Mon Sep 17 00:00:00 2001 From: Daniel Clark Date: Tue, 5 Sep 2023 14:47:58 -0400 Subject: [PATCH] Lower resource requests to idle usage (#563) * change k8s resource requests to reflect idle usage * make presubmit * update other manifests --- .../deploy/operator/05-deployment.yaml | 4 +-- .../deploy/operator/10-collector.yaml | 8 +++--- .../deploy/operator/11-rule-evaluator.yaml | 8 +++--- .../deploy/operator/12-alertmanager.yaml | 8 +++--- .../deploy/rule-evaluator/01-deployment.yaml | 8 +++--- examples/alertmanager.yaml | 12 ++++---- manifests/operator.yaml | 28 +++++++++---------- manifests/rule-evaluator.yaml | 8 +++--- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cmd/operator/deploy/operator/05-deployment.yaml b/cmd/operator/deploy/operator/05-deployment.yaml index c0e9bc3786..8cd072b2aa 100644 --- a/cmd/operator/deploy/operator/05-deployment.yaml +++ b/cmd/operator/deploy/operator/05-deployment.yaml @@ -61,8 +61,8 @@ spec: limits: memory: 2G requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M securityContext: allowPrivilegeEscalation: false capabilities: diff --git a/cmd/operator/deploy/operator/10-collector.yaml b/cmd/operator/deploy/operator/10-collector.yaml index fcc9a50c77..2be03ee3a9 100644 --- a/cmd/operator/deploy/operator/10-collector.yaml +++ b/cmd/operator/deploy/operator/10-collector.yaml @@ -73,8 +73,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true @@ -121,8 +121,8 @@ spec: limits: memory: 2G requests: - cpu: 16m - memory: 128M + cpu: 8m + memory: 32M volumeMounts: - name: storage mountPath: /prometheus/data diff --git a/cmd/operator/deploy/operator/11-rule-evaluator.yaml b/cmd/operator/deploy/operator/11-rule-evaluator.yaml index 2541ae04a3..de43a9a2e0 100644 --- a/cmd/operator/deploy/operator/11-rule-evaluator.yaml +++ b/cmd/operator/deploy/operator/11-rule-evaluator.yaml @@ -70,8 +70,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true @@ -103,8 +103,8 @@ spec: limits: memory: 1G requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M volumeMounts: - name: config-out readOnly: true diff --git a/cmd/operator/deploy/operator/12-alertmanager.yaml b/cmd/operator/deploy/operator/12-alertmanager.yaml index 8ee7f4e841..a53f763873 100644 --- a/cmd/operator/deploy/operator/12-alertmanager.yaml +++ b/cmd/operator/deploy/operator/12-alertmanager.yaml @@ -82,8 +82,8 @@ spec: limits: memory: 128M requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M volumeMounts: - name: alertmanager-config readOnly: true @@ -117,8 +117,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true diff --git a/cmd/operator/deploy/rule-evaluator/01-deployment.yaml b/cmd/operator/deploy/rule-evaluator/01-deployment.yaml index c74f92159b..7e318a310c 100644 --- a/cmd/operator/deploy/rule-evaluator/01-deployment.yaml +++ b/cmd/operator/deploy/rule-evaluator/01-deployment.yaml @@ -56,8 +56,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true @@ -85,8 +85,8 @@ spec: limits: memory: 1G requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M volumeMounts: - name: config-out readOnly: true diff --git a/examples/alertmanager.yaml b/examples/alertmanager.yaml index 9dd44a3e4a..487901fb42 100644 --- a/examples/alertmanager.yaml +++ b/examples/alertmanager.yaml @@ -64,10 +64,10 @@ spec: scheme: HTTP resources: requests: - cpu: 100m - memory: 200Mi + cpu: 1m + memory: 16M limits: - memory: 3000Mi + memory: 128M volumeMounts: - mountPath: /etc/alertmanager/config name: config @@ -95,10 +95,10 @@ spec: name: reloader-web resources: requests: - cpu: 50m - memory: 25Mi + cpu: 1m + memory: 4M limits: - memory: 50Mi + memory: 32M volumeMounts: - mountPath: /etc/alertmanager/config name: config diff --git a/manifests/operator.yaml b/manifests/operator.yaml index d7eddc0ee1..1e4c2fc867 100644 --- a/manifests/operator.yaml +++ b/manifests/operator.yaml @@ -263,8 +263,8 @@ spec: limits: memory: 2G requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M securityContext: allowPrivilegeEscalation: false capabilities: @@ -579,8 +579,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true @@ -627,8 +627,8 @@ spec: limits: memory: 2G requests: - cpu: 16m - memory: 128M + cpu: 8m + memory: 32M volumeMounts: - name: storage mountPath: /prometheus/data @@ -749,8 +749,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true @@ -782,8 +782,8 @@ spec: limits: memory: 1G requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M volumeMounts: - name: config-out readOnly: true @@ -926,8 +926,8 @@ spec: limits: memory: 128M requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M volumeMounts: - name: alertmanager-config readOnly: true @@ -961,8 +961,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true diff --git a/manifests/rule-evaluator.yaml b/manifests/rule-evaluator.yaml index ac1a86165c..f6b13466c1 100644 --- a/manifests/rule-evaluator.yaml +++ b/manifests/rule-evaluator.yaml @@ -88,8 +88,8 @@ spec: limits: memory: 32M requests: - cpu: 8m - memory: 16M + cpu: 1m + memory: 4M volumeMounts: - name: config readOnly: true @@ -117,8 +117,8 @@ spec: limits: memory: 1G requests: - cpu: 8m - memory: 32M + cpu: 1m + memory: 16M volumeMounts: - name: config-out readOnly: true