Add node selector, affinity, and tolerations to engine upgrade jobs (#66

) * Add config for tolerations, node selectors, and affinity to jobs Signed-off-by: Brian Kopp <[email protected]> * Increment chart version Signed-off-by: Brian Kopp <[email protected]> * Remove unnecessary newline Signed-off-by: Brian Kopp <[email protected]>
anchore · Sep 18, 2020 · 739d86f · 739d86f
1 parent bf86560
commit 739d86f
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 2 deletions.
diff --git a/stable/anchore-engine/Chart.yaml b/stable/anchore-engine/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: anchore-engine
-version: 1.9.3
+version: 1.9.4
 appVersion: 0.8.1
 description: Anchore container analysis and policy evaluation engine service
 keywords:

diff --git a/stable/anchore-engine/templates/engine_upgrade_job.yaml b/stable/anchore-engine/templates/engine_upgrade_job.yaml
@@ -73,4 +73,16 @@ spec:
       - name: certs
         secret:
           secretName: {{ . }}
-      {{- end }}
+      {{- end }}
+      {{- with .Values.anchoreEngineUpgradeJob.nodeSelector }}
+      nodeSelector:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.anchoreEngineUpgradeJob.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.anchoreEngineUpgradeJob.tolerations }}
+      tolerations:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/stable/anchore-engine/templates/enterprise_feeds_upgrade_job.yaml b/stable/anchore-engine/templates/enterprise_feeds_upgrade_job.yaml
@@ -71,4 +71,16 @@ spec:
         secret:
           secretName: {{ . }}
       {{- end }}
+      {{- with .Values.anchoreEnterpriseFeedsUpgradeJob.nodeSelector }}
+      nodeSelector:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.anchoreEnterpriseFeedsUpgradeJob.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.anchoreEnterpriseFeedsUpgradeJob.tolerations }}
+      tolerations:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/stable/anchore-engine/templates/enterprise_upgrade_job.yaml b/stable/anchore-engine/templates/enterprise_upgrade_job.yaml
@@ -63,4 +63,16 @@ spec:
         secret:
           secretName: {{ . }}
       {{- end }}
+      {{- with .Values.anchoreEnterpriseEngineUpgradeJob.nodeSelector }}
+      nodeSelector:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.anchoreEnterpriseEngineUpgradeJob.affinity }}
+      affinity:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.anchoreEnterpriseEngineUpgradeJob.tolerations }}
+      tolerations:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/stable/anchore-engine/values.yaml b/stable/anchore-engine/values.yaml
@@ -519,6 +519,12 @@ anchoreSimpleQueue:
   tolerations: []
   affinity: {}
 
+# Pod configuration for the helm post-install-hook engine upgrade Job
+anchoreEngineUpgradeJob:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+
 # This section is used for configuring anchore enterprise.
 anchoreEnterpriseGlobal:
   enabled: false
@@ -628,6 +634,12 @@ anchoreEnterpriseFeeds:
   tolerations: []
   affinity: {}
 
+# Pod configuration for the helm post-install-hook feeds upgrade Job
+anchoreEnterpriseFeedsUpgradeJob:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+
 # Configure the Anchore Enterprise role based access control component.
 # This component consists of 2 containers that run as side-cars in the anchore engine api pod.
 anchoreEnterpriseRbac:
@@ -862,6 +874,12 @@ anchore-ui-redis:
   # eg redis://:<password>@hostname:6379
   externalEndpoint: Null
 
+# Pod configuration for the helm post-install-hook enterprise engine upgrade Job
+anchoreEnterpriseEngineUpgradeJob:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+
 # To inject secrets ( credentails data ) via env, rather k8s secrets please set this flag to true.
 # This feature will be useful, especially to inject secrets directly into k8s pods from hashicorp vault
 # inject_secrets_via_env: false