From c25533ae3d62d21164a81a95a2813c667e5c0d40 Mon Sep 17 00:00:00 2001 From: "Dejaeger, Darren (dd118r)" Date: Thu, 20 Jun 2019 11:26:31 -0400 Subject: [PATCH] Add node selector to test pod and standalone tiller This PS looks to add a node selector into the test pod's spec, as well as the standalone tiller's spec. Change-Id: I8d2054f0d9d360cb6baaa7ff636348c5a4d18149 --- charts/armada/templates/tests/test-armada-api.yaml | 2 ++ charts/armada/values.yaml | 3 +++ charts/tiller/templates/deployment-tiller.yaml | 2 ++ charts/tiller/values.yaml | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/charts/armada/templates/tests/test-armada-api.yaml b/charts/armada/templates/tests/test-armada-api.yaml index 384b141e..a1d41359 100644 --- a/charts/armada/templates/tests/test-armada-api.yaml +++ b/charts/armada/templates/tests/test-armada-api.yaml @@ -30,6 +30,8 @@ metadata: {{ tuple $envAll "armada" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} spec: restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} containers: - name: "{{ .Release.Name }}-armada-api-test" env: diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml index d18bd254..099271d6 100644 --- a/charts/armada/values.yaml +++ b/charts/armada/values.yaml @@ -20,6 +20,9 @@ labels: job: node_selector_key: ucp-control-plane node_selector_value: enabled + test: + node_selector_key: ucp-control-plane + node_selector_value: enabled node_selector_key: ucp-control-plane node_selector_value: enabled diff --git a/charts/tiller/templates/deployment-tiller.yaml b/charts/tiller/templates/deployment-tiller.yaml index 2607f9a0..c7fb813a 100644 --- a/charts/tiller/templates/deployment-tiller.yaml +++ b/charts/tiller/templates/deployment-tiller.yaml @@ -60,6 +60,8 @@ spec: {{ tuple $envAll "tiller" "deploy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} spec: serviceAccountName: {{ $serviceAccountName }} + nodeSelector: + {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: tiller {{ tuple $envAll "tiller" | include "helm-toolkit.snippets.image" | indent 10 }} diff --git a/charts/tiller/values.yaml b/charts/tiller/values.yaml index 59170ae8..d701eba6 100644 --- a/charts/tiller/values.yaml +++ b/charts/tiller/values.yaml @@ -14,6 +14,10 @@ # namespace: "kube-system" +labels: + node_selector_key: ucp-control-plane + node_selector_value: enabled + dependencies: static: tiller_deploy: