update config for nodeAffinity and tolerations

Author: Rub21

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

@@ -72,7 +72,6 @@ spec:
       # nodeSelector:
       #   {{ .Values.cgimap.nodeSelector.label_key }} : {{ .Values.cgimap.nodeSelector.label_value }}
       # {{- end }}
-
       # Affinity settings
       {{- if .Values.cgimap.nodeAffinity.enabled }}
       affinity:
@@ -87,8 +86,8 @@ spec:
                       - {{ . | quote }}
                     {{- end }}
       {{- end }}
-      {{- if .Values.cgimap.tolerations }}
+      {{- if and .Values.cgimap.tolerations .Values.cgimap.tolerations.enabled }}
       tolerations:
-{{ toYaml .Values.cgimap.tolerations | indent 8 }}
+{{ toYaml .Values.cgimap.tolerations.config | indent 8 }}
       {{- end }}
 {{- end }}

osm-seed/templates/db/db-statefulset.yaml

@@ -114,8 +114,25 @@ spec:
           configMap:
             name: {{ .Release.Name }}-db-postgresql-config
         {{- end }}
-      {{- if .Values.db.nodeSelector.enabled }}
-      nodeSelector:
-        {{ .Values.db.nodeSelector.label_key }} : {{ .Values.db.nodeSelector.label_value }}
+      # {{- if .Values.db.nodeSelector.enabled }}
+      # nodeSelector:
+      #   {{ .Values.db.nodeSelector.label_key }} : {{ .Values.db.nodeSelector.label_value }}
+      # {{- end }}
+      {{- if .Values.db.nodeAffinity.enabled }}
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: {{ .Values.db.nodeAffinity.key }}
+                    operator: In
+                    values:
+                    {{- range .Values.db.nodeAffinity.values }}
+                      - {{ . | quote }}
+                    {{- end }}
+      {{- end }}
+      {{- if and .Values.db.tolerations .Values.db.tolerations.enabled }}
+      tolerations:
+{{ toYaml .Values.db.tolerations.config | indent 8 }}
       {{- end }}
 {{- end }}

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

@@ -44,21 +44,21 @@ spec:
       #   {{ .Values.memcached.nodeSelector.label_key }} : {{ .Values.memcached.nodeSelector.label_value }}
       # {{- end }}
       # Affinity settings
-      {{- if .Values.cgimap.nodeAffinity.enabled }}
+      {{- if .Values.memcached.nodeAffinity.enabled }}
       affinity:
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
               - matchExpressions:
-                  - key: {{ .Values.cgimap.nodeAffinity.key }}
+                  - key: {{ .Values.memcached.nodeAffinity.key }}
                     operator: In
                     values:
-                    {{- range .Values.cgimap.nodeAffinity.values }}
+                    {{- range .Values.memcached.nodeAffinity.values }}
                       - {{ . | quote }}
                     {{- end }}
       {{- end }}
-      {{- if .Values.cgimap.tolerations }}
+      {{- if and .Values.memcached.tolerations .Values.memcached.tolerations.enabled }}
       tolerations:
-{{ toYaml .Values.cgimap.tolerations | indent 8 }}
+{{ toYaml .Values.memcached.tolerations.config | indent 8 }}
       {{- end }}
 {{- end }}

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

@@ -214,8 +214,8 @@ spec:
               topologyKey: "kubernetes.io/hostname"
         {{- end }}
       {{- end }}
-      {{- if .Values.web.tolerations }}
+      {{- if and .Values.web.tolerations .Values.web.tolerations.enabled }}
       tolerations:
-{{ toYaml .Values.web.tolerations | indent 8 }}
+{{ toYaml .Values.web.tolerations.config | indent 8 }}
       {{- end }}
 {{- end }}

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

@@ -11,15 +11,15 @@ spec:
   minReplicas: {{ .Values.web.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.web.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.web.autoscaling.cpuUtilization.enable }}
+    {{- if .Values.web.autoscaling.cpuUtilization.enabled }}
     - type: Resource
       resource:
         name: cpu
         target:
           type: Utilization
           averageUtilization: {{ .Values.web.autoscaling.cpuUtilization.value }}
     {{- end }}
-    {{- if .Values.web.autoscaling.memoryUtilization.enable }}
+    {{- if .Values.web.autoscaling.memoryUtilization.enabled }}
     - type: Resource
       resource:
         name: memory

osm-seed/values.yaml

@@ -135,7 +135,17 @@ db:
       max_worker_processes = 4
       max_parallel_workers_per_gather = 2
       max_parallel_workers = 4
-
+  nodeAffinity:
+    enabled: false
+    key: "nodegroup_type"
+    values: ["karpenter"]
+  tolerations:
+    enabled: false
+    config:
+      - key: "nodegroup_type"
+        operator: "Equal"
+        value: "karpenter"
+        effect: "NoSchedule"
 # ====================================================================================================
 # Variables for osm-seed website
 # ====================================================================================================
@@ -144,6 +154,10 @@ web:
   image:
     name: ""
     tag: ""
+  serviceAccount:
+    enabled: false
+    annotations:
+      eks.amazonaws.com/role-arn: arn:aws:iam::123456789012:role/osm-seed-web-s3-sqs-role
   priorityClass: "high-priority"
   replicaCount: 1
   ingressDomain: www.dev.osmseed.org
@@ -206,6 +220,20 @@ web:
         periodSeconds: 60
   sharedMemorySize: 256Mi
   livenessProbeExec: true
+
+  nodeAffinity:
+    enabled: false
+    key: "nodegroup_type"
+    values: ["karpenter"]
+  podAntiAffinity: # To set that no two pods are scheduled on the same node
+    enabled: false
+  tolerations:
+    enabled: false
+    config:
+      - key: "nodegroup_type"
+        operator: "Equal"
+        value: "karpenter"
+        effect: "NoSchedule"
 # ====================================================================================================
 # Variables for memcached. Memcached is used to store session cookies
 # ====================================================================================================
@@ -226,7 +254,17 @@ memcached:
       enabled: false
       memory: "2Gi"
       cpu: "2"
-
+  nodeAffinity:
+    enabled: false
+    key: "nodegroup_type"
+    values: ["karpenter"]
+  tolerations:
+    enabled: false
+    config:
+      - key: "nodegroup_type"
+        operator: "Equal"
+        value: "karpenter"
+        effect: "NoSchedule"
 # ====================================================================================================
 # Cgimap
 # ====================================================================================================
@@ -254,6 +292,17 @@ cgimap:
     maxReplicas: 4
     cpuUtilization: 60
     memoryUtilization: 60
+  nodeAffinity:
+    enabled: false
+    key: "nodegroup_type"
+    values: ["karpenter"]
+  tolerations:
+    enabled: false
+    config:
+      - key: "nodegroup_type"
+        operator: "Equal"
+        value: "karpenter"
+        effect: "NoSchedule"
 # ====================================================================================================
 # Variables for full-history container
 # ====================================================================================================