Add ability to set topology spread constraints in the Helm charts

charts/viking-controller/templates/deployment.yaml

@@ -119,6 +119,10 @@ spec:
     {{- if .Values.vikingController.affinity }}
       affinity:
         {{ toYaml .Values.vikingController.affinity | nindent 8 }}
+    {{- end }}
+    {{- if .Values.vikingController.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.vikingController.topologySpreadConstraints | nindent 8 }}
     {{- end }}
       serviceAccountName: {{ template "viking-controller.fullname" . }}
       terminationGracePeriodSeconds: {{ .Values.vikingController.terminationGracePeriodSeconds }}

charts/viking-controller/values.yaml

@@ -101,10 +101,10 @@ vikingController:
     #     podAffinityTerm:
     #       labelSelector:
     #         matchExpressions:
-    #         - key: app
+    #         - key: app.kubernetes.io/instance
     #           operator: In
     #           values:
-    #           - nginx-ingress
+    #           - viking-service
     #       topologyKey: kubernetes.io/hostname
 
     # # An example of required pod anti-affinity
@@ -112,12 +112,24 @@ vikingController:
     #   requiredDuringSchedulingIgnoredDuringExecution:
     #   - labelSelector:
     #       matchExpressions:
-    #       - key: app
+    #       - key: app.kubernetes.io/instance
     #         operator: In
     #         values:
-    #         - nginx-ingress
+    #         - viking-service
     #     topologyKey: "kubernetes.io/hostname"
 
+  topologySpreadConstraints: {}
+    # # An example of spreading the pods over availability zones
+    # - maxSkew: 1
+    #   topologyKey: topology.kubernetes.io/zone
+    #   whenUnsatisfiable: ScheduleAnyway
+    #   labelSelector:
+    #     matchExpressions:
+    #     - key: app.kubernetes.io/instance
+    #       operator: In
+    #       values:
+    #       - viking-service
+
   ## terminationGracePeriodSeconds
   ##
   terminationGracePeriodSeconds: 60

charts/viking-service/templates/deployment.yaml

@@ -208,6 +208,10 @@ spec:
     {{- if .Values.vikingService.affinity }}
       affinity:
         {{- toYaml .Values.vikingService.affinity | nindent 8 }}
+    {{- end }}
+    {{- if .Values.vikingService.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml .Values.vikingService.topologySpreadConstraints | nindent 8 }}
     {{- end }}
       serviceAccountName: {{ template "viking-service.fullname" . }}
       terminationGracePeriodSeconds: {{ .Values.vikingService.terminationGracePeriodSeconds }}

charts/viking-service/values.yaml

@@ -131,10 +131,10 @@ vikingService:
     #     podAffinityTerm:
     #       labelSelector:
     #         matchExpressions:
-    #         - key: app
+    #         - key: app.kubernetes.io/instance
     #           operator: In
     #           values:
-    #           - nginx-ingress
+    #           - viking-service
     #       topologyKey: kubernetes.io/hostname
 
     # # An example of required pod anti-affinity
@@ -142,12 +142,24 @@ vikingService:
     #   requiredDuringSchedulingIgnoredDuringExecution:
     #   - labelSelector:
     #       matchExpressions:
-    #       - key: app
+    #       - key: app.kubernetes.io/instance
     #         operator: In
     #         values:
-    #         - nginx-ingress
+    #         - viking-service
     #     topologyKey: "kubernetes.io/hostname"
 
+  topologySpreadConstraints: {}
+    # # An example of spreading the pods over availability zones
+    # - maxSkew: 1
+    #   topologyKey: topology.kubernetes.io/zone
+    #   whenUnsatisfiable: ScheduleAnyway
+    #   labelSelector:
+    #     matchExpressions:
+    #     - key: app.kubernetes.io/instance
+    #       operator: In
+    #       values:
+    #       - viking-service
+
   ## terminationGracePeriodSeconds
   ##
   terminationGracePeriodSeconds: 60