Adding affinity support

charts/brigade-github-app/templates/deployment.yaml

@@ -32,6 +32,10 @@ spec:
         type: github-app
     spec:
       serviceAccountName: {{ $serviceAccount }}
+      {{ if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8}}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.registry }}/{{ .Values.name }}:{{ default .Chart.AppVersion .Values.tag }}"

charts/brigade-github-app/values.yaml

@@ -66,4 +66,16 @@ github:
 
   ## Add custom annotations to the api pod
   # podAnnotations:
-  #   name: value
+  #   name: value
+
+affinity: {}
+# Azure specific example
+#affinity:
+#  nodeAffinity:
+#    requiredDuringSchedulingIgnoredDuringExecution:
+#      nodeSelectorTerms:
+#      - matchExpressions:
+#        - key: agentpool
+#          operator: In
+#          values:
+#          - nodepool01

charts/brigade/templates/api-deployment.yaml

@@ -29,6 +29,10 @@ spec:
         app: {{ template "brigade.fullname" . }}-api
         role: api
     spec:
+      {{ if .Values.api.affinity }}
+      affinity:
+{{ toYaml .Values.api.affinity | indent 8}}
+      {{- end }}
       serviceAccountName: {{ $serviceAccount }}
       containers:
       - name: {{ .Chart.Name }}

charts/brigade/templates/controller-deployment.yaml

@@ -29,6 +29,10 @@ spec:
         role: controller
     spec:
       serviceAccountName: {{ $serviceAccount }}
+      {{ if .Values.controller.affinity }}
+      affinity:
+{{ toYaml .Values.controller.affinity | indent 8}}
+      {{- end }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.controller.registry }}/{{ .Values.controller.name }}:{{ default .Chart.AppVersion .Values.controller.tag }}"
@@ -46,6 +50,12 @@ spec:
         - -worker-limits-memory={{ default "" .Values.controller.workerResources.limits.memory }}
         {{- end }}
         {{- end }}
+        {{ if .Values.controller.workerNodePoolKey }}
+        - -worker-node-pool-key={{ default "" .Values.controller.workerNodePoolKey }}
+        {{- end }}
+        {{ if .Values.controller.workerNodePoolValue }}
+        - -worker-node-pool-value={{ default "" .Values.controller.workerNodePoolValue }}
+        {{- end }}
         env:
           - name: BRIGADE_NAMESPACE
             valueFrom:

charts/brigade/templates/gateway-cr-deployment.yaml

@@ -32,6 +32,10 @@ spec:
         role: gateway
         type: dockerhub
     spec:
+      {{ if .Values.cr.affinity }}
+      affinity:
+{{ toYaml .Values.cr.affinity | indent 8}}
+      {{- end }}
       serviceAccountName: {{ $serviceAccount }}
       containers:
       - name: {{ .Chart.Name }}

charts/brigade/templates/gateway-generic-deployment.yaml

@@ -32,6 +32,10 @@ spec:
         role: gateway
         type: generic
     spec:
+      {{ if .Values.genericGateway.affinity }}
+      affinity:
+{{ toYaml .Values.genericGateway.affinity | indent 8}}
+      {{- end }}
       serviceAccountName: {{ $serviceAccount }}
       containers:
       - name: {{ .Chart.Name }}

charts/brigade/templates/vacuum-cronjob.yaml

@@ -23,6 +23,10 @@ spec:
             role: vacuum
         spec:
           serviceAccountName: {{ $serviceAccount }}
+          {{- if .Values.vacuum.affinity }}
+          affinity:
+{{ toYaml .Values.vacuum.affinity | indent 12}}
+          {{ end }}
           containers:
           - name: {{ .Chart.Name }}-vacuum
             image: "{{ .Values.vacuum.registry }}/{{ .Values.vacuum.name }}:{{ default .Chart.AppVersion .Values.vacuum.tag }}"

charts/brigade/values.yaml

@@ -94,6 +94,24 @@ controller:
   ## The default tag is the value of .Chart.AppVersion
   # tag:
   # pullPolicy: IfNotPresent
+
+  ## values for creating affinities for brigade worker
+  # workerNodePoolKey: agentpool
+  # workerNodePoolValue: nodepool01
+
+  # affinity commands where to schedule controller pod
+  affinity: {}
+  # Azure specific example
+  #affinity:
+  #  nodeAffinity:
+  #    requiredDuringSchedulingIgnoredDuringExecution:
+  #      nodeSelectorTerms:
+  #      - matchExpressions:
+  #        - key: agentpool
+  #          operator: In
+  #          values:
+  #          - nodepool01
+
   # workerResources:
   #   limits:
   #     cpu:
@@ -138,6 +156,17 @@ api:
   serviceAccount:
     create: true
     name:
+  affinity: {}
+  # Azure specific example
+  #affinity:
+  #  nodeAffinity:
+  #    requiredDuringSchedulingIgnoredDuringExecution:
+  #      nodeSelectorTerms:
+  #      - matchExpressions:
+  #        - key: agentpool
+  #          operator: In
+  #          values:
+  #          - nodepool01
   ## Add custom annotations to the api pod
   # podAnnotations:
   #   name: value
@@ -182,6 +211,17 @@ cr:
   serviceAccount:
     create: true
     name:
+  affinity: {}
+  # Azure specific example
+  #affinity:
+  #  nodeAffinity:
+  #    requiredDuringSchedulingIgnoredDuringExecution:
+  #      nodeSelectorTerms:
+  #      - matchExpressions:
+  #        - key: agentpool
+  #          operator: In
+  #          values:
+  #          - nodepool01
   ## Add custom annotations to the cr gateway pod
   # podAnnotations:
   #   name: value
@@ -205,6 +245,17 @@ genericGateway:
     name:
   ingress:
     enabled: false
+  affinity: {}
+  # Azure specific example
+  #affinity:
+  #  nodeAffinity:
+  #    requiredDuringSchedulingIgnoredDuringExecution:
+  #      nodeSelectorTerms:
+  #      - matchExpressions:
+  #        - key: agentpool
+  #          operator: In
+  #          values:
+  #          - nodepool01
   ## Add custom annotations to the generic gateway pod
   # podAnnotations:
   #   name: value
@@ -270,6 +321,17 @@ vacuum:
   successfulJobsHistoryLimit: 10
   ## The maximum number of failed vacuum jobs to retain in the cluster.
   failedJobsHistoryLimit: 10
+  affinity: {}
+  # Azure specific example
+  #affinity:
+  #  nodeAffinity:
+  #    requiredDuringSchedulingIgnoredDuringExecution:
+  #      nodeSelectorTerms:
+  #      - matchExpressions:
+  #        - key: agentpool
+  #          operator: In
+  #          values:
+  #          - nodepool01
 
 ## DEVELOPMENT ONLY: Use this for off-ACS development
 ## Before enabling this, log into the acr registry with Docker and then

charts/kashti/templates/deployment.yaml

@@ -25,6 +25,10 @@ spec:
         app: {{ template "name" . }}
         release: {{ .Release.Name }}
     spec:
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8}}
+      {{ end }}
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"

charts/kashti/values.yaml

@@ -44,3 +44,15 @@ resources: {}
 ## Add custom annotations to the kashti pod
 # podAnnotations:
 #   name: value
+
+affinity: {}
+# Azure specific example
+#affinity:
+#  nodeAffinity:
+#    requiredDuringSchedulingIgnoredDuringExecution:
+#      nodeSelectorTerms:
+#      - matchExpressions:
+#        - key: agentpool
+#          operator: In
+#          values:
+#          - nodepool01