Merge pull request #47 from 7knot/feat/additional-affinity-for-observer

feat: add ability to set additional affinity for observer.
growilabs · Jun 10, 2022 · bf1a7be · bf1a7be
2 parents 52e79f2 + b016544
commit bf1a7be
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/charts/panope/Chart.yaml b/charts/panope/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.7
+version: 0.6.8
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/panope/templates/observer/daemonset.yaml b/charts/panope/templates/observer/daemonset.yaml
@@ -34,16 +34,10 @@ spec:
       # necessary to hit the node's metadata server when using Workload Identity
       hostNetwork: true
       terminationGracePeriodSeconds: 30 # for graceful shutdown
+      {{- with .Values.observer.affinity }}
       affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: cloud.google.com/gke-preemptible
-                operator: Exists
-            - matchExpressions:
-              - key: cloud.google.com/gke-spot
-                operator: Exists
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.observer.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/panope/values.yaml b/charts/panope/values.yaml
@@ -220,10 +220,22 @@ observer:
 
   imagePullSecrets: []
 
+  affinity:
+    # following affinity is required for the observer to work properly
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: cloud.google.com/gke-preemptible
+            operator: Exists
+        - matchExpressions:
+          - key: cloud.google.com/gke-spot
+            operator: Exists
+
   daemonset:
     # labels to add to the deployment
     labels: {}
-    # Annotations to add to the deployment
+    # annotations to add to the deployment
     annotations: {}
 
   secret: