Merge pull request #1161 from kinvolk/invidian/fix-contour-jobs-toler…

…ations contour: apply node affinity and tolerations also to certgen job
kinvolk · Nov 23, 2020 · 6e6d4f0 · 6e6d4f0
2 parents b58336b + 5b78d0b
commit 6e6d4f0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/assets/charts/components/contour/templates/02-job-certgen.yaml b/assets/charts/components/contour/templates/02-job-certgen.yaml
@@ -45,6 +45,24 @@ spec:
       labels:
         app: "contour-certgen"
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app: contour
+              topologyKey: kubernetes.io/hostname
+            weight: 100
+
+        {{- with .Values.nodeAffinity }}
+        nodeAffinity:
+{{ toYaml . | indent 10 }}
+        {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+      {{- end }}
       containers:
       - name: contour
         # This version is set to latest because Job specs are immutable;

diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go