From d46d4bf85cbff766b9f03412eb7dd0886e520c4f Mon Sep 17 00:00:00 2001
From: "Dejaeger, Darren (dd118r)" <dd118r@att.com>
Date: Thu, 20 Jun 2019 11:28:08 -0400
Subject: [PATCH] Add node selector to test pods

This PS looks to add a node selector into the test pod's spec.

Change-Id: I438a9bf08f6ef6c4d8961f9197928b8b17cfbbd2
---
 charts/coredns/templates/pod-test.yaml                   | 2 ++
 charts/haproxy/templates/tests/test-haproxy-health.yaml  | 2 ++
 charts/haproxy/values.yaml                               | 5 +++++
 charts/promenade/templates/tests/test-promenade-api.yaml | 2 ++
 charts/promenade/values.yaml                             | 4 +++-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/charts/coredns/templates/pod-test.yaml b/charts/coredns/templates/pod-test.yaml
index 3ef3e9a5..d456281b 100644
--- a/charts/coredns/templates/pod-test.yaml
+++ b/charts/coredns/templates/pod-test.yaml
@@ -28,6 +28,8 @@ metadata:
 {{ tuple $envAll "coredns" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   restartPolicy: Never
+  nodeSelector:
+    {{ .Values.labels.coredns.node_selector_key }}: {{ .Values.labels.coredns.node_selector_value }}
   containers:
     - name: {{ .Release.Name }}-test
       image: {{ .Values.images.tags.test }}
diff --git a/charts/haproxy/templates/tests/test-haproxy-health.yaml b/charts/haproxy/templates/tests/test-haproxy-health.yaml
index c0d2e5de..6e3e26c2 100644
--- a/charts/haproxy/templates/tests/test-haproxy-health.yaml
+++ b/charts/haproxy/templates/tests/test-haproxy-health.yaml
@@ -29,6 +29,8 @@ metadata:
 {{ tuple $envAll "kubernetes" "haproxy-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 }}-haproxy-test"
       env:
diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index de9d60ae..d462ed31 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -12,6 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+labels:
+  test:
+    node_selector_key: ucp-control-plane
+    node_selector_value: enabled
+
 conf:
   anchor:
     files_to_copy:
diff --git a/charts/promenade/templates/tests/test-promenade-api.yaml b/charts/promenade/templates/tests/test-promenade-api.yaml
index 70780f99..b13caf7c 100644
--- a/charts/promenade/templates/tests/test-promenade-api.yaml
+++ b/charts/promenade/templates/tests/test-promenade-api.yaml
@@ -30,6 +30,8 @@ metadata:
 {{ tuple $envAll "promenade" "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 }}
   initContainers:
 {{ tuple $envAll "test" $mounts_promenade_api_test | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
   containers:
diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml
index 5a1d8682..2d6ef375 100644
--- a/charts/promenade/values.yaml
+++ b/charts/promenade/values.yaml
@@ -57,11 +57,13 @@ images:
       - dep_check
       - image_repo_sync
 
-
 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