From e9179d309d3e1ee6a9434b74d94ce4142ee237e4 Mon Sep 17 00:00:00 2001 From: Maxence 'Linutux' POULAIN Date: Wed, 22 Mar 2023 11:27:36 +0100 Subject: [PATCH] feat: Add helm chart value to render tolerations in the controller Signed-off-by: Maxence 'Linutux' POULAIN --- charts/prom-aggregation-gateway/Chart.yaml | 2 +- .../templates/controller.yaml | 6 ++++++ .../tests/controller_test.yaml | 14 ++++++++++++++ charts/prom-aggregation-gateway/values.schema.json | 3 +++ charts/prom-aggregation-gateway/values.yaml | 2 ++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/charts/prom-aggregation-gateway/Chart.yaml b/charts/prom-aggregation-gateway/Chart.yaml index 696ba46..04a17cb 100644 --- a/charts/prom-aggregation-gateway/Chart.yaml +++ b/charts/prom-aggregation-gateway/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: prom-aggregation-gateway -version: 0.5.2 +version: 0.5.3 home: https://github.com/zapier/prom-aggregation-gateway maintainers: - name: djeebus diff --git a/charts/prom-aggregation-gateway/templates/controller.yaml b/charts/prom-aggregation-gateway/templates/controller.yaml index f3ff2c1..96c09a6 100644 --- a/charts/prom-aggregation-gateway/templates/controller.yaml +++ b/charts/prom-aggregation-gateway/templates/controller.yaml @@ -56,3 +56,9 @@ spec: {{- with .Values.controller.resources }} resources: {{ . | toYaml | nindent 12 }} {{- end }} + {{- if .Values.controller.tolerations }} + tolerations: + {{- with .Values.controller.tolerations }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} diff --git a/charts/prom-aggregation-gateway/tests/controller_test.yaml b/charts/prom-aggregation-gateway/tests/controller_test.yaml index f11a20b..ddc2faa 100644 --- a/charts/prom-aggregation-gateway/tests/controller_test.yaml +++ b/charts/prom-aggregation-gateway/tests/controller_test.yaml @@ -38,3 +38,17 @@ tests: asserts: - isNull: path: spec.template.spec.containers[0].env + - it: can render tolerations + set: + controller: + tolerations: + - key: CriticalAddonsOnly + operator: Exists + - operator: Exists + effect: NoExecute + asserts: + - equal: + path: spec.template.spec.tolerations + value: + - {key: CriticalAddonsOnly, operator: Exists} + - {operator: Exists, effect: NoExecute} diff --git a/charts/prom-aggregation-gateway/values.schema.json b/charts/prom-aggregation-gateway/values.schema.json index 8ca811d..7ea8148 100644 --- a/charts/prom-aggregation-gateway/values.schema.json +++ b/charts/prom-aggregation-gateway/values.schema.json @@ -48,6 +48,9 @@ "patternProperties": { ".*": {"type": "string"} } + }, + "tolerations": { + "type": "array" } }, "required": [ diff --git a/charts/prom-aggregation-gateway/values.yaml b/charts/prom-aggregation-gateway/values.yaml index 1cc6fd0..be43e81 100644 --- a/charts/prom-aggregation-gateway/values.yaml +++ b/charts/prom-aggregation-gateway/values.yaml @@ -13,6 +13,8 @@ controller: env: GIN_MODE: release + tolerations: [] + podMonitor: create: true