From b657379f2e885c37fcb10041f6d2de6ca020fc0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Szczygie=C5=82?= <kamil@szczygiel.io>
Date: Mon, 2 Jul 2018 22:07:28 +0200
Subject: [PATCH] [Concourse] add nodeSelector for web (#6267)

* [concourse] add nodeselector for web

* bump chart version

* typo

* update values.yaml and README

* bump chart version

* Bump minor version for new feature
---
 stable/concourse/Chart.yaml                    | 2 +-
 stable/concourse/README.md                     | 1 +
 stable/concourse/templates/web-deployment.yaml | 4 ++++
 stable/concourse/values.yaml                   | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml
index cc53af38b8..1aea279f79 100644
--- a/stable/concourse/Chart.yaml
+++ b/stable/concourse/Chart.yaml
@@ -1,5 +1,5 @@
 name: concourse
-version: 1.10.1
+version: 1.11.0
 appVersion: 3.14.1
 description: Concourse is a simple and scalable CI system.
 icon: https://avatars1.githubusercontent.com/u/7809479
diff --git a/stable/concourse/README.md b/stable/concourse/README.md
index 59aad2aeec..abf9073c39 100644
--- a/stable/concourse/README.md
+++ b/stable/concourse/README.md
@@ -108,6 +108,7 @@ The following table lists the configurable parameters of the Concourse chart and
 | `web.additionalAffinities` | Additional affinities to apply to web pods. E.g: node affinity | `{}` |
 | `web.annotations`| Concourse Web deployment annotations | `nil` |
 | `web.tolerations` | Tolerations for the web nodes | `[]` |
+| `web.nodeSelector` | Node selector for web nodes | `{}` |
 | `web.service.type` | Concourse Web service type | `ClusterIP` |
 | `web.service.annotations` | Concourse Web Service annotations | `nil` |
 | `web.service.loadBalancerSourceRanges` | Concourse Web Service Load Balancer Source IP ranges | `nil` |
diff --git a/stable/concourse/templates/web-deployment.yaml b/stable/concourse/templates/web-deployment.yaml
index 49d560c313..3d3aee386a 100644
--- a/stable/concourse/templates/web-deployment.yaml
+++ b/stable/concourse/templates/web-deployment.yaml
@@ -17,6 +17,10 @@ spec:
       annotations:
 {{ toYaml .Values.web.annotations | indent 8 }}
     spec:
+    {{- with .Values.web.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "concourse.web.fullname" . }}{{ else }}{{ .Values.rbac.webServiceAccountName }}{{ end }}
       tolerations:
 {{ toYaml .Values.web.tolerations | indent 8 }}
diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml
index 1e2ee23937..71bcc7c12c 100644
--- a/stable/concourse/values.yaml
+++ b/stable/concourse/values.yaml
@@ -214,6 +214,9 @@ web:
   #   key1: "value1"
   #   key2: "value2"
 
+  ## Node selector for web nodes.
+  nodeSelector: {}
+
   ## Tolerations for the web nodes.
   ## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
   tolerations: []