diff --git a/charts/operator/templates/alertmanager.yaml b/charts/operator/templates/alertmanager.yaml index fe6cab027d..e4467e500b 100644 --- a/charts/operator/templates/alertmanager.yaml +++ b/charts/operator/templates/alertmanager.yaml @@ -68,6 +68,7 @@ spec: drop: - all privileged: false + resources: {{- toYaml $.Values.resources.bash | nindent 10}} containers: - name: alertmanager image: {{.Values.images.alertmanager.image}}:{{.Values.images.alertmanager.tag}} diff --git a/charts/operator/templates/collector.yaml b/charts/operator/templates/collector.yaml index 1f772d2577..19a78ed945 100644 --- a/charts/operator/templates/collector.yaml +++ b/charts/operator/templates/collector.yaml @@ -54,6 +54,7 @@ spec: drop: - all privileged: false + resources: {{- toYaml $.Values.resources.bash | nindent 10}} containers: - name: config-reloader image: {{.Values.images.configReloader.image}}:{{.Values.images.configReloader.tag}} @@ -72,7 +73,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - resources: {{- toYaml $.Values.resources.bash | nindent 10}} + resources: {{- toYaml $.Values.resources.configReloader | nindent 10}} volumeMounts: - name: config readOnly: true @@ -117,7 +118,7 @@ spec: env: - name: GOGC value: "25" - resources: {{- toYaml $.Values.resources.collector | nindent 10 }} + resources: {{- toYaml $.Values.resources.prometheus | nindent 10 }} volumeMounts: - name: storage mountPath: /prometheus/data diff --git a/charts/operator/templates/rule-evaluator.yaml b/charts/operator/templates/rule-evaluator.yaml index e69261c505..8b7067fe7b 100644 --- a/charts/operator/templates/rule-evaluator.yaml +++ b/charts/operator/templates/rule-evaluator.yaml @@ -54,6 +54,7 @@ spec: drop: - all privileged: false + resources: {{- toYaml $.Values.resources.bash | nindent 10 }} containers: - name: config-reloader image: {{.Values.images.configReloader.image}}:{{.Values.images.configReloader.tag}} diff --git a/charts/values.global.yaml b/charts/values.global.yaml index e502a4887a..904a3ae406 100644 --- a/charts/values.global.yaml +++ b/charts/values.global.yaml @@ -49,11 +49,11 @@ resources: memory: 16M bash: limits: - memory: 32M + memory: 6M requests: cpu: 1m - memory: 4M - collector: + memory: 6M + prometheus: limits: memory: 2G requests: diff --git a/manifests/operator.yaml b/manifests/operator.yaml index f3ded461d3..2c9427f697 100644 --- a/manifests/operator.yaml +++ b/manifests/operator.yaml @@ -354,6 +354,12 @@ spec: drop: - all privileged: false + resources: + limits: + memory: 6M + requests: + cpu: 1m + memory: 6M containers: - name: config-reloader image: gke.gcr.io/prometheus-engine/config-reloader:v0.9.0-gke.1 @@ -634,6 +640,12 @@ spec: drop: - all privileged: false + resources: + limits: + memory: 6M + requests: + cpu: 1m + memory: 6M containers: - name: config-reloader image: gke.gcr.io/prometheus-engine/config-reloader:v0.9.0-gke.1 @@ -800,6 +812,12 @@ spec: drop: - all privileged: false + resources: + limits: + memory: 6M + requests: + cpu: 1m + memory: 6M containers: - name: alertmanager image: gke.gcr.io/prometheus-engine/alertmanager:v0.25.1-gmp.2-gke.0