From 9a5b91d35923272c55e998f21ff096b5c0268ad2 Mon Sep 17 00:00:00 2001 From: Enzo Candotti Date: Wed, 6 Oct 2021 18:25:10 -0300 Subject: [PATCH 8/8] Add toleration to armada-api Signed-off-by: Yue Tao --- charts/armada/templates/deployment-api.yaml | 4 ++++ charts/armada/templates/tests/test-armada-api.yaml | 4 ++++ charts/armada/values.yaml | 2 ++ 3 files changed, 10 insertions(+) diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml index 5c4825c..3ee086a 100644 --- a/charts/armada/templates/deployment-api.yaml +++ b/charts/armada/templates/deployment-api.yaml @@ -125,6 +125,10 @@ spec: initContainers: {{ tuple $envAll "api" $mounts_armada_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ dict "envAll" $envAll "application" "armada" "container" "armada_api_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} +{{- with .Values.pod.tolerations.api }} + tolerations: +{{ toYaml . | indent 8 }} +{{- end }} containers: - name: armada-api {{ tuple $envAll "api" | include "helm-toolkit.snippets.image" | indent 10 }} diff --git a/charts/armada/templates/tests/test-armada-api.yaml b/charts/armada/templates/tests/test-armada-api.yaml index 895353a..aa9e37a 100644 --- a/charts/armada/templates/tests/test-armada-api.yaml +++ b/charts/armada/templates/tests/test-armada-api.yaml @@ -32,6 +32,10 @@ metadata: spec: {{ dict "envAll" $envAll "application" "api_test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }} restartPolicy: Never +{{- with .Values.pod.tolerations.api }} + tolerations: +{{ toYaml . | indent 4 }} +{{- end }} nodeSelector: {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} containers: diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml index da45810..3644706 100644 --- a/charts/armada/values.yaml +++ b/charts/armada/values.yaml @@ -233,6 +233,8 @@ monitoring: port: 8000 pod: + tolerations: + api: [] mandatory_access_control: type: apparmor armada-api: -- 2.34.1