From b7c29d241434895b062c84f6730f186d02ce0c86 Mon Sep 17 00:00:00 2001
From: "Dejaeger, Darren (dd118r)" <dd118r@att.com>
Date: Tue, 24 Sep 2019 10:58:14 -0400
Subject: [PATCH] (tests) Add NodeSelector to Helm test

- Addition of a NodeSelector into the MAAS API helm test pod spec,
to assist it getting placed onto the correct set of nodes.

Change-Id: I31ca107a20f358760b77cadeef1a7f01bd8eb885
---
 charts/maas/templates/tests/test-maas-init.yaml | 2 ++
 charts/maas/values.yaml                         | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/charts/maas/templates/tests/test-maas-init.yaml b/charts/maas/templates/tests/test-maas-init.yaml
index 61240ec..1f4d161 100644
--- a/charts/maas/templates/tests/test-maas-init.yaml
+++ b/charts/maas/templates/tests/test-maas-init.yaml
@@ -30,6 +30,8 @@ metadata:
 {{ tuple $envAll "maas" "init-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 }}-api-test"
       env:
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index e81a165..5a3e4d6 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -127,6 +127,9 @@ labels:
   syslog:
     node_selector_key: ucp-control-plane
     node_selector_value: enabled
+  test:
+    node_selector_key: ucp-control-plane
+    node_selector_value: enabled
 
 network:
   maas_ingress: