From 09cdb0459d324b6d12e328311dac30dbf470c5b3 Mon Sep 17 00:00:00 2001
From: Mark Burnett <mark.m.burnett@gmail.com>
Date: Fri, 23 Mar 2018 16:28:21 -0500
Subject: [PATCH] Add node selector to coredns chart

Change-Id: I5ffb775ed4d78ca0ee0badfca04a6d4383c0085e
---
 charts/coredns/templates/deployment.yaml             | 2 ++
 charts/coredns/values.yaml                           | 5 ++++-
 examples/basic/Genesis.yaml                          | 1 +
 examples/complete/Genesis.yaml                       | 1 +
 tools/g2/manifests/conformance.json                  | 1 +
 tools/g2/manifests/integration.json                  | 1 +
 tools/g2/manifests/resiliency.json                   | 1 +
 tools/gate/config-templates/genesis-config.yaml      | 1 +
 tools/gate/config-templates/joining-host-config.yaml | 3 +++
 9 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/charts/coredns/templates/deployment.yaml b/charts/coredns/templates/deployment.yaml
index a27b3458..bd44f48a 100644
--- a/charts/coredns/templates/deployment.yaml
+++ b/charts/coredns/templates/deployment.yaml
@@ -39,6 +39,8 @@ spec:
       tolerations:
         - key: "CriticalAddonsOnly"
           operator: "Exists"
+      nodeSelector:
+        {{ .Values.labels.coredns.node_selector_key }}: {{ .Values.labels.coredns.node_selector_value }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
diff --git a/charts/coredns/values.yaml b/charts/coredns/values.yaml
index e82b68b0..73f441b7 100644
--- a/charts/coredns/values.yaml
+++ b/charts/coredns/values.yaml
@@ -28,7 +28,10 @@ images:
     test: coredns/coredns:1.0.5
   pull_policy: "IfNotPresent"
 
-node_selector: {}
+labels:
+  coredns:
+    node_selector_key: coredns
+    node_selector_value: enabled
 
 service:
   name: coredns
diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index 88fb2a2e..f924e500 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -14,6 +14,7 @@ data:
   labels:
     dynamic:
       - calico-etcd=enabled
+      - coredns=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index df1254b8..037bde62 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -20,6 +20,7 @@ data:
       - ceph-osd=enabled
       - ceph-rgw=enabled
       - ceph-mgr=enabled
+      - coredns=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
diff --git a/tools/g2/manifests/conformance.json b/tools/g2/manifests/conformance.json
index 02309f2a..554a8b74 100644
--- a/tools/g2/manifests/conformance.json
+++ b/tools/g2/manifests/conformance.json
@@ -37,6 +37,7 @@
         "-n", "n2",
         "-n", "n3",
         "-l", "calico-etcd=enabled",
+        "-l", "coredns=enabled",
         "-l", "kubernetes-apiserver=enabled",
         "-l", "kubernetes-controller-manager=enabled",
         "-l", "kubernetes-etcd=enabled",
diff --git a/tools/g2/manifests/integration.json b/tools/g2/manifests/integration.json
index 0edc1ef4..fb56ab2b 100644
--- a/tools/g2/manifests/integration.json
+++ b/tools/g2/manifests/integration.json
@@ -54,6 +54,7 @@
         "-l", "ceph-mon=enabled",
         "-l", "ceph-osd=enabled",
         "-l", "ceph-rgw=enabled",
+        "-l", "coredns=enabled",
         "-l", "ucp-control-plane=enabled",
         "-e", "kubernetes n0 genesis n1",
         "-e", "calico n0 n0 n1"
diff --git a/tools/g2/manifests/resiliency.json b/tools/g2/manifests/resiliency.json
index 657f6415..d30d9d73 100644
--- a/tools/g2/manifests/resiliency.json
+++ b/tools/g2/manifests/resiliency.json
@@ -42,6 +42,7 @@
         "-n", "n2",
         "-n", "n3",
         "-l", "calico-etcd=enabled",
+        "-l", "coredns=enabled",
         "-l", "kubernetes-apiserver=enabled",
         "-l", "kubernetes-controller-manager=enabled",
         "-l", "kubernetes-etcd=enabled",
diff --git a/tools/gate/config-templates/genesis-config.yaml b/tools/gate/config-templates/genesis-config.yaml
index d3101f09..d801dac2 100644
--- a/tools/gate/config-templates/genesis-config.yaml
+++ b/tools/gate/config-templates/genesis-config.yaml
@@ -18,6 +18,7 @@ data:
       - ceph-osd=enabled
       - ceph-rgw=enabled
       - ceph-mgr=enabled
+      - coredns=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
diff --git a/tools/gate/config-templates/joining-host-config.yaml b/tools/gate/config-templates/joining-host-config.yaml
index f7c110e4..ed83615f 100644
--- a/tools/gate/config-templates/joining-host-config.yaml
+++ b/tools/gate/config-templates/joining-host-config.yaml
@@ -19,6 +19,7 @@ data:
       - ceph-osd=enabled
       - ceph-rgw=enabled
       - ceph-mgr=enabled
+      - coredns=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
@@ -48,6 +49,7 @@ data:
       - ceph-osd=enabled
       - ceph-rgw=enabled
       - ceph-mgr=enabled
+      - coredns=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled
@@ -77,6 +79,7 @@ data:
       - ceph-osd=enabled
       - ceph-rgw=enabled
       - ceph-mgr=enabled
+      - coredns=enabled
       - kubernetes-apiserver=enabled
       - kubernetes-controller-manager=enabled
       - kubernetes-etcd=enabled