Add affinity config - web

Author: Rub21

osm-seed/templates/cgimap/cgimap-deployment.yaml

@@ -68,8 +68,27 @@ spec:
               value: {{ .Values.web.env.WEBSITE_STATUS }}
             - name: MEMCACHE_SERVER
               value: {{ .Release.Name }}-memcached:11211
-      {{- if .Values.cgimap.nodeSelector.enabled }}
-      nodeSelector:
-        {{ .Values.cgimap.nodeSelector.label_key }} : {{ .Values.cgimap.nodeSelector.label_value }}
+      # {{- if .Values.cgimap.nodeSelector.enabled }}
+      # nodeSelector:
+      #   {{ .Values.cgimap.nodeSelector.label_key }} : {{ .Values.cgimap.nodeSelector.label_value }}
+      # {{- end }}
+
+      # Affinity settings
+      {{- if .Values.cgimap.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.cgimap.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.cgimap.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
+      {{- if .Values.cgimap.tolerations }}
+      tolerations:
+{{ toYaml .Values.cgimap.tolerations | indent 8 }}
       {{- end }}
 {{- end }}

osm-seed/templates/memcached/memcached-deployment.yml

@@ -39,8 +39,26 @@ spec:
               memory: {{ .Values.memcached.resources.limits.memory }}
               cpu: {{ .Values.memcached.resources.limits.cpu }}
           {{- end }}
-      {{- if .Values.memcached.nodeSelector.enabled }}
-      nodeSelector:
-        {{ .Values.memcached.nodeSelector.label_key }} : {{ .Values.memcached.nodeSelector.label_value }}
+      # {{- if .Values.memcached.nodeSelector.enabled }}
+      # nodeSelector:
+      #   {{ .Values.memcached.nodeSelector.label_key }} : {{ .Values.memcached.nodeSelector.label_value }}
+      # {{- end }}
+      # Affinity settings
+      {{- if .Values.cgimap.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.cgimap.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.cgimap.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
+      {{- if .Values.cgimap.tolerations }}
+      tolerations:
+{{ toYaml .Values.cgimap.tolerations | indent 8 }}
       {{- end }}
 {{- end }}

osm-seed/templates/web/web-deployment.yaml

@@ -22,6 +22,9 @@ spec:
         release: {{ .Release.Name }}
         run: {{ .Release.Name }}-web
     spec:
+      {{- if .Values.web.serviceAccount.enable }}
+      serviceAccountName: {{ .Values.web.serviceAccount.name }}
+      {{- end }}
       priorityClassName: {{ .Release.Name }}-{{ .Values.web.priorityClass | default "high-priority" }}
       containers:
         - name: {{ .Chart.Name }}-web
@@ -186,8 +189,33 @@ spec:
             medium: Memory
             sizeLimit: {{ .Values.web.sharedMemorySize }}
           name: shared-memory
-      {{- if .Values.web.nodeSelector.enabled }}
-      nodeSelector:
-        {{ .Values.web.nodeSelector.label_key }} : {{ .Values.web.nodeSelector.label_value }}
+
+      # Node affinity
+      {{- if .Values.web.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.web.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.web.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+        # Pod anti-affinity, to set that no two pods are scheduled on the same node
+        {{- if .Values.web.podAntiAffinity.enabled }}
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  app: {{ template "osm-seed.name" . }}
+                  component: web-deployment
+              topologyKey: "kubernetes.io/hostname"
+        {{- end }}
+      {{- end }}
+      {{- if .Values.web.tolerations }}
+      tolerations:
+{{ toYaml .Values.web.tolerations | indent 8 }}
       {{- end }}
 {{- end }}