343: node selection for helm chart - engine only - corrected config positioning

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 }}

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: ""