Merge pull request #61 from foomo/topologySpreadConstraints

feat: add scheduling topologySpreadConstraints
foomo · Feb 5, 2025 · 38d9a6a · 38d9a6a
2 parents 9162cf3 + 767550b
commit 38d9a6a
Show file tree

Hide file tree

Showing 37 changed files with 1,058 additions and 51 deletions.
diff --git a/charts/contentserver/Chart.yaml b/charts/contentserver/Chart.yaml
@@ -17,5 +17,5 @@ annotations:
     - name: Image Source
       url: https://github.com/foomo/contentserver
 
-version: 0.2.1
+version: 0.3.0
 appVersion: 1.11.2
diff --git a/charts/contentserver/README.md b/charts/contentserver/README.md
@@ -1,6 +1,6 @@
 # contentserver
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.2](https://img.shields.io/badge/AppVersion-1.11.2-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.2](https://img.shields.io/badge/AppVersion-1.11.2-informational?style=flat-square)
 
 Helm chart for the foomo Content Server.
 
@@ -150,11 +150,12 @@ Helm chart for the foomo Content Server.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| scheduling.affinity | object | `{}` | Affinity for pod assignment |
+| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/master","operator":"In","values":[""]}]}]}}` | Affinity for pod assignment |
 | scheduling.enabled | bool | `false` | Indicates wether scheduling is enabled or not |
 | scheduling.nodeSelector | object | `{}` | Node labels for pod assignment |
 | scheduling.priorityClass | string | `nil` | Priority class name |
 | scheduling.tolerations | list | `[]` | Tolerations for pod assignment |
+| scheduling.topologySpreadConstraints | list | `[{"matchLabelKeys":["pod-template-hash"],"maxSkew":1,"topologyKey":"kubernetes.io/hostname","whenUnsatisfiable":"DoNotSchedule"},{"maxSkew":1,"topologyKey":"topology.kubernetes.io/zone","whenUnsatisfiable":"ScheduleAnyway"}]` | Tolerations for pod assignment |
 
 ### Security Context
 

diff --git a/charts/contentserver/templates/deployment.yaml b/charts/contentserver/templates/deployment.yaml
@@ -124,6 +124,17 @@ spec:
       {{- with .Values.scheduling.tolerations }}
       tolerations:{{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.scheduling.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- $labelSelector := dict
+          "labelSelector" (dict
+            "matchLabels" (fromYaml (include "contentserver.selectorLabels" $))
+          )
+        }}
+        {{- range . }}
+        - {{ toYaml (mergeOverwrite $labelSelector .) | nindent 10 }}
+        {{- end }}
+      {{- end }}
       {{- end }}
       volumes:
         {{- if .Values.persistence.enabled }}

diff --git a/charts/contentserver/values.schema.json b/charts/contentserver/values.schema.json
@@ -835,7 +835,87 @@
         "affinity": {
           "additionalProperties": true,
           "description": "Affinity for pod assignment",
-          "required": [],
+          "properties": {
+            "requiredDuringSchedulingIgnoredDuringExecution": {
+              "additionalProperties": false,
+              "properties": {
+                "nodeSelectorTerms": {
+                  "items": {
+                    "anyOf": [
+                      {
+                        "additionalProperties": false,
+                        "properties": {
+                          "matchExpressions": {
+                            "items": {
+                              "anyOf": [
+                                {
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "key": {
+                                      "default": "node-role.kubernetes.io/master",
+                                      "required": [],
+                                      "title": "key",
+                                      "type": "string"
+                                    },
+                                    "operator": {
+                                      "default": "In",
+                                      "required": [],
+                                      "title": "operator",
+                                      "type": "string"
+                                    },
+                                    "values": {
+                                      "items": {
+                                        "anyOf": [
+                                          {
+                                            "required": [],
+                                            "type": "string"
+                                          }
+                                        ],
+                                        "required": []
+                                      },
+                                      "required": [],
+                                      "title": "values",
+                                      "type": "array"
+                                    }
+                                  },
+                                  "required": [
+                                    "key",
+                                    "operator",
+                                    "values"
+                                  ],
+                                  "type": "object"
+                                }
+                              ],
+                              "required": []
+                            },
+                            "required": [],
+                            "title": "matchExpressions",
+                            "type": "array"
+                          }
+                        },
+                        "required": [
+                          "matchExpressions"
+                        ],
+                        "type": "object"
+                      }
+                    ],
+                    "required": []
+                  },
+                  "required": [],
+                  "title": "nodeSelectorTerms",
+                  "type": "array"
+                }
+              },
+              "required": [
+                "nodeSelectorTerms"
+              ],
+              "title": "requiredDuringSchedulingIgnoredDuringExecution",
+              "type": "object"
+            }
+          },
+          "required": [
+            "requiredDuringSchedulingIgnoredDuringExecution"
+          ],
           "title": "affinity",
           "type": "object"
         },
@@ -873,6 +953,17 @@
           "required": [],
           "title": "tolerations",
           "type": "array"
+        },
+        "topologySpreadConstraints": {
+          "description": "Tolerations for pod assignment",
+          "items": {
+            "additionalProperties": true,
+            "required": [],
+            "type": "object"
+          },
+          "required": [],
+          "title": "topologySpreadConstraints",
+          "type": "array"
         }
       },
       "required": [],

diff --git a/charts/contentserver/values.yaml b/charts/contentserver/values.yaml
@@ -476,7 +476,7 @@ routing:
   # -- Parent references
   # @section -- Routing
   parentRefs: []
-  
+
 # @schema
 # type: object
 # @schema
@@ -753,7 +753,13 @@ scheduling:
   # @schema
   # -- Affinity for pod assignment
   # @section -- Scheduling
-  affinity: {}
+  affinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: node-role.kubernetes.io/master
+              operator: In
+              values: [""]
   # @schema
   # type: object
   # additionalProperties: true
@@ -776,6 +782,23 @@ scheduling:
   # -- Priority class name
   # @section -- Scheduling
   priorityClass: null
+  # @schema
+  # type: array
+  # items:
+  #   type: object
+  #   additionalProperties: true
+  # @schema
+  # -- Tolerations for pod assignment
+  # @section -- Scheduling
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: "kubernetes.io/hostname"
+      whenUnsatisfiable: DoNotSchedule
+      matchLabelKeys:
+        - pod-template-hash
+    - maxSkew: 1
+      topologyKey: "topology.kubernetes.io/zone"
+      whenUnsatisfiable: ScheduleAnyway
 
 # @schema
 # type: object

diff --git a/charts/sesamy-gtm/Chart.yaml b/charts/sesamy-gtm/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
       url: https://github.com/foomo/helm-charts/tree/main/charts/sesamy-gtm
     - name: GTM Changelog
       url: https://developers.google.com/tag-platform/tag-manager/server-side/release-notes
-version: 0.2.1
+version: 0.3.0
 appVersion: 2.4.0
diff --git a/charts/sesamy-gtm/README.md b/charts/sesamy-gtm/README.md
@@ -1,6 +1,6 @@
 # sesamy-gtm
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
 
 Helm chart for the Sesamy GTM tagging & preview service.
 
@@ -175,11 +175,12 @@ Helm chart for the Sesamy GTM tagging & preview service.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| scheduling.affinity | object | `{}` | Affinity for pod assignment |
+| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/master","operator":"In","values":[""]}]}]}}` | Affinity for pod assignment |
 | scheduling.enabled | bool | `false` | Indicates wether scheduling is enabled or not |
 | scheduling.nodeSelector | object | `{}` | Node labels for pod assignment |
 | scheduling.priorityClass | string | `nil` | Priority class name |
 | scheduling.tolerations | list | `[]` | Tolerations for pod assignment |
+| scheduling.topologySpreadConstraints | list | `[{"matchLabelKeys":["pod-template-hash"],"maxSkew":1,"topologyKey":"kubernetes.io/hostname","whenUnsatisfiable":"DoNotSchedule"},{"maxSkew":1,"topologyKey":"topology.kubernetes.io/zone","whenUnsatisfiable":"ScheduleAnyway"}]` | Tolerations for pod assignment |
 
 ### Service Account
 

diff --git a/charts/sesamy-gtm/templates/collect/deployment.yaml b/charts/sesamy-gtm/templates/collect/deployment.yaml
@@ -93,6 +93,17 @@ spec:
       {{- with .Values.scheduling.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.scheduling.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{ $labelSelector := dict
+          "labelSelector" (dict
+            "matchLabels" (include "sesamy.gtm.collect.selectorLabels" $)
+          )
+        }}
+        {{- range . }}
+        - {{ toYaml (mergeOverwrite $labelSelector .) | nindent 10 }}
+        {{- end }}
+      {{- end }}
       {{- end }}
       {{- with .Values.collect.extraVolumes }}
       volumes: {{- toYaml . | nindent 8 }}

diff --git a/charts/sesamy-gtm/templates/preview/deployment.yaml b/charts/sesamy-gtm/templates/preview/deployment.yaml
@@ -121,6 +121,17 @@ spec:
       {{- with .Values.scheduling.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.scheduling.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{ $labelSelector := dict
+          "labelSelector" (dict
+            "matchLabels" (include "sesamy.gtm.preview.selectorLabels" $)
+          )
+        }}
+        {{- range . }}
+        - {{ toYaml (mergeOverwrite $labelSelector .) | nindent 10 }}
+        {{- end }}
+      {{- end }}
       {{- end }}
       volumes:
         - name: gtm-preview-proxy-config

diff --git a/charts/sesamy-gtm/templates/tagging/deployment.yaml b/charts/sesamy-gtm/templates/tagging/deployment.yaml
@@ -114,6 +114,18 @@ spec:
       {{- with .Values.scheduling.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.scheduling.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{ $labelSelector := dict
+          "labelSelector" (dict
+            "matchLabels" (include "sesamy.gtm.tagging.selectorLabels" $)
+          )
+        }}
+        {{- range . }}
+        - {{ toYaml (mergeOverwrite $labelSelector .) | nindent 10 }}
+        {{- end }}
+      {{- end }}
+
       {{- end }}
       {{- if or .Values.gtm.googleApplicationCredentials .Values.tagging.extraVolumes }}
       volumes:

diff --git a/charts/sesamy-gtm/values.schema.json b/charts/sesamy-gtm/values.schema.json
@@ -1405,7 +1405,87 @@
         "affinity": {
           "additionalProperties": true,
           "description": "Affinity for pod assignment",
-          "required": [],
+          "properties": {
+            "requiredDuringSchedulingIgnoredDuringExecution": {
+              "additionalProperties": false,
+              "properties": {
+                "nodeSelectorTerms": {
+                  "items": {
+                    "anyOf": [
+                      {
+                        "additionalProperties": false,
+                        "properties": {
+                          "matchExpressions": {
+                            "items": {
+                              "anyOf": [
+                                {
+                                  "additionalProperties": false,
+                                  "properties": {
+                                    "key": {
+                                      "default": "node-role.kubernetes.io/master",
+                                      "required": [],
+                                      "title": "key",
+                                      "type": "string"
+                                    },
+                                    "operator": {
+                                      "default": "In",
+                                      "required": [],
+                                      "title": "operator",
+                                      "type": "string"
+                                    },
+                                    "values": {
+                                      "items": {
+                                        "anyOf": [
+                                          {
+                                            "required": [],
+                                            "type": "string"
+                                          }
+                                        ],
+                                        "required": []
+                                      },
+                                      "required": [],
+                                      "title": "values",
+                                      "type": "array"
+                                    }
+                                  },
+                                  "required": [
+                                    "key",
+                                    "operator",
+                                    "values"
+                                  ],
+                                  "type": "object"
+                                }
+                              ],
+                              "required": []
+                            },
+                            "required": [],
+                            "title": "matchExpressions",
+                            "type": "array"
+                          }
+                        },
+                        "required": [
+                          "matchExpressions"
+                        ],
+                        "type": "object"
+                      }
+                    ],
+                    "required": []
+                  },
+                  "required": [],
+                  "title": "nodeSelectorTerms",
+                  "type": "array"
+                }
+              },
+              "required": [
+                "nodeSelectorTerms"
+              ],
+              "title": "requiredDuringSchedulingIgnoredDuringExecution",
+              "type": "object"
+            }
+          },
+          "required": [
+            "requiredDuringSchedulingIgnoredDuringExecution"
+          ],
           "title": "affinity",
           "type": "object"
         },
@@ -1444,6 +1524,17 @@
           "required": [],
           "title": "tolerations",
           "type": "array"
+        },
+        "topologySpreadConstraints": {
+          "description": "Tolerations for pod assignment",
+          "items": {
+            "additionalProperties": true,
+            "required": [],
+            "type": "object"
+          },
+          "required": [],
+          "title": "topologySpreadConstraints",
+          "type": "array"
         }
       },
       "required": [],