Remove tolerations

Author: Rub21

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

@@ -86,8 +86,4 @@ spec:
                       - {{ . | quote }}
                     {{- end }}
       {{- end }}
-      {{- if and .Values.cgimap.tolerations .Values.cgimap.tolerations.enabled }}
-      tolerations:
-{{ toYaml .Values.cgimap.tolerations.config | indent 8 }}
-      {{- end }}
 {{- end }}

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

@@ -114,10 +114,6 @@ 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 }}
-      # {{- end }}
       {{- if .Values.db.nodeAffinity.enabled }}
       affinity:
         nodeAffinity:
@@ -131,8 +127,4 @@ spec:
                       - {{ . | 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

@@ -57,8 +57,4 @@ spec:
                       - {{ . | quote }}
                     {{- end }}
       {{- end }}
-      {{- if and .Values.memcached.tolerations .Values.memcached.tolerations.enabled }}
-      tolerations:
-{{ toYaml .Values.memcached.tolerations.config | indent 8 }}
-      {{- end }}
 {{- end }}

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

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

osm-seed/values.yaml

@@ -138,14 +138,7 @@ db:
   nodeAffinity:
     enabled: false
     key: "nodegroup_type"
-    values: ["karpenter"]
-  tolerations:
-    enabled: false
-    config:
-      - key: "nodegroup_type"
-        operator: "Equal"
-        value: "karpenter"
-        effect: "NoSchedule"
+    values: ["database"]
 # ====================================================================================================
 # Variables for osm-seed website
 # ====================================================================================================
@@ -222,18 +215,11 @@ web:
   livenessProbeExec: true
 
   nodeAffinity:
-    enabled: false
+    enabled: true
     key: "nodegroup_type"
-    values: ["karpenter"]
+    values: ["web"]
   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
 # ====================================================================================================
@@ -257,14 +243,7 @@ memcached:
   nodeAffinity:
     enabled: false
     key: "nodegroup_type"
-    values: ["karpenter"]
-  tolerations:
-    enabled: false
-    config:
-      - key: "nodegroup_type"
-        operator: "Equal"
-        value: "karpenter"
-        effect: "NoSchedule"
+    values: ["web"]
 # ====================================================================================================
 # Cgimap
 # ====================================================================================================
@@ -295,14 +274,7 @@ cgimap:
   nodeAffinity:
     enabled: false
     key: "nodegroup_type"
-    values: ["karpenter"]
-  tolerations:
-    enabled: false
-    config:
-      - key: "nodegroup_type"
-        operator: "Equal"
-        value: "karpenter"
-        effect: "NoSchedule"
+    values: ["web"]
 # ====================================================================================================
 # Variables for full-history container
 # ====================================================================================================