From 67465168b8551ebdc886013268abae550d20c564 Mon Sep 17 00:00:00 2001
From: Manu Vamadevan <manu.vamadevan@allianz.de>
Date: Mon, 8 Aug 2022 20:17:31 +0200
Subject: [PATCH 1/3] 343: node selection for helm chart - engine only -
 Initial commit

---
 helm/oncall/templates/engine/deployment.yaml | 12 ++++++++++++
 helm/oncall/values.yaml                      | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/helm/oncall/templates/engine/deployment.yaml b/helm/oncall/templates/engine/deployment.yaml
index 9c9d0f76..262b403a 100644
--- a/helm/oncall/templates/engine/deployment.yaml
+++ b/helm/oncall/templates/engine/deployment.yaml
@@ -71,3 +71,15 @@ spec:
             timeoutSeconds: 3
           resources:
             {{- toYaml .Values.engine.resources | nindent 12 }}
+      {{- with .Values.grafana.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.grafana.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.grafana.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml
index 95ab565e..d49fd25b 100644
--- a/helm/oncall/values.yaml
+++ b/helm/oncall/values.yaml
@@ -161,6 +161,18 @@ grafana:
     enabled: true
   plugins:
     - grafana-oncall-app
+  ## @param affinity Affinity for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: { }
+  ## @param nodeSelector Node labels for pod assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: { }
+  ## @param tolerations Tolerations for pod assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: [ ]
 
 nameOverride: ""
 fullnameOverride: ""

From 9495ee9f140d570a08d406d0ada2aede576e23b0 Mon Sep 17 00:00:00 2001
From: Manu Vamadevan <manu.vamadevan@allianz.de>
Date: Mon, 8 Aug 2022 23:25:00 +0200
Subject: [PATCH 2/3] 343: node selection for helm chart - engine only -
 corrected config positioning

---
 helm/oncall/templates/engine/deployment.yaml |  6 ++---
 helm/oncall/values.yaml                      | 24 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/helm/oncall/templates/engine/deployment.yaml b/helm/oncall/templates/engine/deployment.yaml
index 262b403a..dc836feb 100644
--- a/helm/oncall/templates/engine/deployment.yaml
+++ b/helm/oncall/templates/engine/deployment.yaml
@@ -71,15 +71,15 @@ spec:
             timeoutSeconds: 3
           resources:
             {{- toYaml .Values.engine.resources | nindent 12 }}
-      {{- with .Values.grafana.nodeSelector }}
+      {{- with .Values.engine.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.grafana.affinity }}
+      {{- with .Values.engine.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.grafana.tolerations }}
+      {{- with .Values.engine.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml
index d49fd25b..9d753f83 100644
--- a/helm/oncall/values.yaml
+++ b/helm/oncall/values.yaml
@@ -28,6 +28,18 @@ engine:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
+  ## @param affinity Affinity for pod assignment
+  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  ##
+  affinity: { }
+  ## @param nodeSelector Node labels for pod assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  ##
+  nodeSelector: { }
+  ## @param tolerations Tolerations for pod assignment
+  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  ##
+  tolerations: [ ]
 
 # Celery workers pods configuration
 celery:
@@ -161,18 +173,6 @@ grafana:
     enabled: true
   plugins:
     - grafana-oncall-app
-  ## @param affinity Affinity for pod assignment
-  ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-  ##
-  affinity: { }
-  ## @param nodeSelector Node labels for pod assignment
-  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
-  ##
-  nodeSelector: { }
-  ## @param tolerations Tolerations for pod assignment
-  ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
-  ##
-  tolerations: [ ]
 
 nameOverride: ""
 fullnameOverride: ""

From b9b36b3393933f7623002f018dc321d4bca0dfb2 Mon Sep 17 00:00:00 2001
From: Manu Vamadevan <manu.vamadevan@allianz.de>
Date: Tue, 9 Aug 2022 10:08:27 +0200
Subject: [PATCH 3/3] 343: node selection for helm chart - engine only - added
 blank line for seperation

---
 helm/oncall/values.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml
index 9d753f83..27af56e5 100644
--- a/helm/oncall/values.yaml
+++ b/helm/oncall/values.yaml
@@ -28,6 +28,7 @@ engine:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
+
   ## @param affinity Affinity for pod assignment
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ##