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
This commit is contained in:
Dejaeger, Darren (dd118r) 2019-06-20 11:26:31 -04:00
parent 07b4f61c05
commit c25533ae3d
4 changed files with 11 additions and 0 deletions

View File

@ -30,6 +30,8 @@ metadata:
{{ tuple $envAll "armada" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{ tuple $envAll "armada" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
restartPolicy: Never restartPolicy: Never
nodeSelector:
{{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
containers: containers:
- name: "{{ .Release.Name }}-armada-api-test" - name: "{{ .Release.Name }}-armada-api-test"
env: env:

View File

@ -20,6 +20,9 @@ labels:
job: job:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled
test:
node_selector_key: ucp-control-plane
node_selector_value: enabled
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
node_selector_value: enabled node_selector_value: enabled

View File

@ -60,6 +60,8 @@ spec:
{{ tuple $envAll "tiller" "deploy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} {{ tuple $envAll "tiller" "deploy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers: containers:
- name: tiller - name: tiller
{{ tuple $envAll "tiller" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll "tiller" | include "helm-toolkit.snippets.image" | indent 10 }}

View File

@ -14,6 +14,10 @@
# namespace: "kube-system" # namespace: "kube-system"
labels:
node_selector_key: ucp-control-plane
node_selector_value: enabled
dependencies: dependencies:
static: static:
tiller_deploy: tiller_deploy: