From ca4fb44b9705d30c13e8c4a06864cb7773c18a80 Mon Sep 17 00:00:00 2001
From: "Hussey, Scott (sh8121)" <sh8121@att.com>
Date: Fri, 21 Jun 2019 15:58:45 -0500
Subject: [PATCH] (fix) add node selector to apiserver-webhook

- Add a nodeSelector stanza to the apiserver-webhook pod
  template
- Add the release_uuid pattern

Change-Id: I2754dffb2931a965335ee0961013e5edd9feee6d
---
 charts/apiserver-webhook/templates/deployment.yaml | 5 +++++
 charts/apiserver-webhook/values.yaml               | 1 +
 2 files changed, 6 insertions(+)

diff --git a/charts/apiserver-webhook/templates/deployment.yaml b/charts/apiserver-webhook/templates/deployment.yaml
index 286f1ff5..764c6881 100644
--- a/charts/apiserver-webhook/templates/deployment.yaml
+++ b/charts/apiserver-webhook/templates/deployment.yaml
@@ -103,6 +103,8 @@ kind: Deployment
 metadata:
   name: {{ .Release.Name }}-apiserver-webhook
   labels:
+  annotations:
+{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 4 }}
 {{ tuple $envAll "kubernetes-keystone-webhook" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   replicas: {{ $envAll.Values.pod.replicas.api }}
@@ -114,9 +116,12 @@ spec:
       labels:
 {{ tuple $envAll "kubernetes-keystone-webhook" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
       annotations:
+{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
     spec:
+      nodeSelector:
+        {{ .Values.labels.kubernetes_apiserver.node_selector_key }}: {{ .Values.labels.kubernetes_apiserver.node_selector_value }}
       affinity:
 {{ tuple $envAll "kubernetes-keystone-webhook" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       dnsPolicy: ClusterFirst
diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml
index f93cc48e..974d39b7 100644
--- a/charts/apiserver-webhook/values.yaml
+++ b/charts/apiserver-webhook/values.yaml
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 release_group: null
+release_uuid: null
 
 images:
   tags: