From d419cb7beee239219f025fc4367bc4e6589ebc92 Mon Sep 17 00:00:00 2001 From: pontusarfwedson Date: Wed, 28 Feb 2018 22:19:46 +0100 Subject: [PATCH] Added nodeSelector to Concourse worker (#3876) * Added additionalSpec to values and statefulset template * conflict resolve * Bumped chart version * added space to comment * replaced additionalSpec with more finegrained nodeSelector --- stable/concourse/Chart.yaml | 2 +- stable/concourse/templates/worker-statefulset.yaml | 4 ++++ stable/concourse/values.yaml | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stable/concourse/Chart.yaml b/stable/concourse/Chart.yaml index 4d6c3e1ff6..cc72f6c87b 100644 --- a/stable/concourse/Chart.yaml +++ b/stable/concourse/Chart.yaml @@ -1,5 +1,5 @@ name: concourse -version: 1.0.0 +version: 1.0.1 appVersion: 3.9.0 description: Concourse is a simple and scalable CI system. icon: https://avatars1.githubusercontent.com/u/7809479 diff --git a/stable/concourse/templates/worker-statefulset.yaml b/stable/concourse/templates/worker-statefulset.yaml index 07773ebd3d..1378547a0e 100644 --- a/stable/concourse/templates/worker-statefulset.yaml +++ b/stable/concourse/templates/worker-statefulset.yaml @@ -20,6 +20,10 @@ spec: {{ $key }}: {{ $value | quote }} {{- end }} spec: + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} serviceAccountName: {{ if .Values.rbac.create }}{{ template "concourse.worker.fullname" . }}{{ else }}{{ .Values.rbac.workerServiceAccountName }}{{ end }} tolerations: {{ toYaml .Values.worker.tolerations | indent 8 }} diff --git a/stable/concourse/values.yaml b/stable/concourse/values.yaml index 7ae8b2d6c1..f9548adbd7 100644 --- a/stable/concourse/values.yaml +++ b/stable/concourse/values.yaml @@ -323,6 +323,11 @@ worker: # iam.amazonaws.com/role: arn:aws:iam::123456789012:role/concourse # + ## Node selector for the worker nodes. + ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector + nodeSelector: {} + # nodeSelector: {type: concourse} + ## Additional affinities to add to the worker pods. ## Useful if you prefer to run workers on non-spot instances, for example ##