Merge pull request #63 from foomo/preview-autoscaling

feat(sesamy-gtm): preview autoscaling
foomo · Feb 5, 2025 · eb8f686 · eb8f686
2 parents 38d9a6a + ef1d101
commit eb8f686
Show file tree

Hide file tree

Showing 41 changed files with 72 additions and 106 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.3.0
+version: 0.3.1
 appVersion: 1.11.2
diff --git a/charts/contentserver/README.md b/charts/contentserver/README.md
@@ -1,6 +1,6 @@
 # contentserver
 
-![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)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.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)
 
 Helm chart for the foomo Content Server.
 
@@ -150,7 +150,7 @@ Helm chart for the foomo Content Server.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/master","operator":"In","values":[""]}]}]}}` | Affinity for pod assignment |
+| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/control-plane","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 |

diff --git a/charts/contentserver/values.schema.json b/charts/contentserver/values.schema.json
@@ -852,7 +852,7 @@
                                   "additionalProperties": false,
                                   "properties": {
                                     "key": {
-                                      "default": "node-role.kubernetes.io/master",
+                                      "default": "node-role.kubernetes.io/control-plane",
                                       "required": [],
                                       "title": "key",
                                       "type": "string"

diff --git a/charts/contentserver/values.yaml b/charts/contentserver/values.yaml
@@ -757,7 +757,7 @@ scheduling:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
         - matchExpressions:
-            - key: node-role.kubernetes.io/master
+            - key: node-role.kubernetes.io/control-plane
               operator: In
               values: [""]
   # @schema

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.3.0
+version: 0.3.1
 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.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)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.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)
 
 Helm chart for the Sesamy GTM tagging & preview service.
 
@@ -175,7 +175,7 @@ Helm chart for the Sesamy GTM tagging & preview service.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/master","operator":"In","values":[""]}]}]}}` | Affinity for pod assignment |
+| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/control-plane","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 |

diff --git a/charts/sesamy-gtm/templates/collect/deployment.yaml b/charts/sesamy-gtm/templates/collect/deployment.yaml
@@ -3,8 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "sesamy.gtm.collect.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   {{- if not .Values.autoscaling.enabled }}

diff --git a/charts/sesamy-gtm/templates/collect/horizontalpodautoscaler.yaml b/charts/sesamy-gtm/templates/collect/horizontalpodautoscaler.yaml
@@ -4,8 +4,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "sesamy.gtm.collect.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   scaleTargetRef:

diff --git a/charts/sesamy-gtm/templates/collect/poddisruptionbudget.yaml b/charts/sesamy-gtm/templates/collect/poddisruptionbudget.yaml
@@ -1,21 +1,17 @@
-{{- if .Values.collect.enabled }}
-{{- if gt (int .Values.collect.replicaCount) 1 }}
+{{- if and .Values.collect.enabled .Values.autoscaling.enabled }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "sesamy.gtm.collect.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   selector:
-    matchLabels:
-      {{- include "sesamy.gtm.collect.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "sesamy.gtm.collect.selectorLabels" . | nindent 6 }}
   {{- with .Values.autoscaling.minAvailable }}
   minAvailable: {{ . }}
   {{- end }}
   {{- with .Values.autoscaling.maxUnavailable }}
   maxUnavailable: {{ . }}
   {{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/sesamy-gtm/templates/collect/service.yaml b/charts/sesamy-gtm/templates/collect/service.yaml
@@ -3,11 +3,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "sesamy.gtm.collect.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.collect.labels" . | nindent 4 }}
   {{- with .Values.collect.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:

diff --git a/charts/sesamy-gtm/templates/preview/deployment.yaml b/charts/sesamy-gtm/templates/preview/deployment.yaml
@@ -2,8 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "sesamy.gtm.preview.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -13,8 +12,7 @@ spec:
   strategy:
     type: {{ .Values.updateStrategy }}
   selector:
-    matchLabels:
-      {{- include "sesamy.gtm.preview.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "sesamy.gtm.preview.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
@@ -30,16 +28,13 @@ spec:
     spec:
       serviceAccountName: {{ include "sesamy.gtm.serviceAccountName" . }}
       {{- with .Values.preview.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+      imagePullSecrets: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.preview.hostAliases }}
-      hostAliases:
-        {{- toYaml . | nindent 8 }}
+      hostAliases: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.preview.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
+      securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: gtm-preview-proxy
@@ -57,8 +52,7 @@ spec:
             tcpSocket:
               port: 443
           {{- with .Values.proxy.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
+          resources: {{- toYaml . | nindent 12 }}
           {{- end }}
           volumeMounts:
             - name: gtm-preview-proxy-config
@@ -73,8 +67,7 @@ spec:
           imagePullPolicy: {{ .pullPolicy }}
           {{- end }}
           {{- with .Values.preview.securityContext }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
+          securityContext: {{- toYaml . | nindent 12 }}
           {{- end }}
           ports:
             - name: http

diff --git a/charts/sesamy-gtm/templates/preview/horizontalpodautoscaler.yaml b/charts/sesamy-gtm/templates/preview/horizontalpodautoscaler.yaml
@@ -3,8 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "sesamy.gtm.preview.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   scaleTargetRef:

diff --git a/charts/sesamy-gtm/templates/preview/poddisruptionbudget.yaml b/charts/sesamy-gtm/templates/preview/poddisruptionbudget.yaml
@@ -1,15 +1,13 @@
-{{- if gt (int .Values.preview.replicaCount) 1 }}
+{{- if .Values.autoscaling.enabled }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "sesamy.gtm.preview.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   selector:
-    matchLabels:
-      {{- include "sesamy.gtm.preview.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "sesamy.gtm.preview.selectorLabels" . | nindent 6 }}
   {{- with .Values.autoscaling.minAvailable }}
   minAvailable: {{ . }}
   {{- end }}

diff --git a/charts/sesamy-gtm/templates/preview/service.yaml b/charts/sesamy-gtm/templates/preview/service.yaml
@@ -2,11 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "sesamy.gtm.preview.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.preview.labels" . | nindent 4 }}
   {{- with .Values.preview.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
@@ -18,5 +16,4 @@ spec:
     - name: http
       port: {{ .Values.preview.service.port }}
       targetPort: http
-  selector:
-    {{- include "sesamy.gtm.preview.selectorLabels" . | nindent 4 }}
+  selector: {{- include "sesamy.gtm.preview.selectorLabels" . | nindent 4 }}
diff --git a/charts/sesamy-gtm/templates/tagging/deployment.yaml b/charts/sesamy-gtm/templates/tagging/deployment.yaml
@@ -2,8 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "sesamy.gtm.tagging.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
@@ -18,8 +17,7 @@ spec:
   template:
     metadata:
       {{- with .Values.tagging.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
+      annotations: {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
         {{- include "sesamy.gtm.tagging.labels" . | nindent 8 }}
@@ -29,16 +27,13 @@ spec:
     spec:
       serviceAccountName: {{ include "sesamy.gtm.serviceAccountName" . }}
       {{- with .Values.tagging.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+      imagePullSecrets: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.tagging.hostAliases }}
-      hostAliases:
-        {{- toYaml . | nindent 8 }}
+      hostAliases: {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.tagging.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
+      securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: gtm-tagging
@@ -125,7 +120,6 @@ spec:
         - {{ toYaml (mergeOverwrite $labelSelector .) | nindent 10 }}
         {{- end }}
       {{- end }}
-
       {{- end }}
       {{- if or .Values.gtm.googleApplicationCredentials .Values.tagging.extraVolumes }}
       volumes:

diff --git a/charts/sesamy-gtm/templates/tagging/horizontalpodautoscaler.yaml b/charts/sesamy-gtm/templates/tagging/horizontalpodautoscaler.yaml
@@ -3,8 +3,7 @@ apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "sesamy.gtm.tagging.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
   scaleTargetRef:

diff --git a/charts/sesamy-gtm/templates/tagging/poddisruptionbudget.yaml b/charts/sesamy-gtm/templates/tagging/poddisruptionbudget.yaml
@@ -3,12 +3,10 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "sesamy.gtm.tagging.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
 spec:
   selector:
-    matchLabels:
-      {{- include "sesamy.gtm.tagging.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "sesamy.gtm.tagging.selectorLabels" . | nindent 6 }}
   {{- with .Values.autoscaling.minAvailable }}
   minAvailable: {{ . }}
   {{- end }}

diff --git a/charts/sesamy-gtm/templates/tagging/secret.yaml b/charts/sesamy-gtm/templates/tagging/secret.yaml
@@ -3,8 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "sesamy.gtm.tagging.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 type: Opaque
 data:

diff --git a/charts/sesamy-gtm/templates/tagging/service.yaml b/charts/sesamy-gtm/templates/tagging/service.yaml
@@ -2,11 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "sesamy.gtm.tagging.fullname" . }}
-  labels:
-    {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
+  labels: {{- include "sesamy.gtm.tagging.labels" . | nindent 4 }}
   {{- with .Values.tagging.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
+  annotations: {{- toYaml . | nindent 4 }}
   {{- end }}
   namespace: {{ include "sesamy.gtm.namespace" . }}
 spec:
@@ -25,5 +23,4 @@ spec:
       {{- with .Values.tagging.service.appProtocol }}
       appProtocol: {{ . }}
       {{- end }}
-  selector:
-    {{- include "sesamy.gtm.tagging.selectorLabels" . | nindent 4 }}
+  selector: {{- include "sesamy.gtm.tagging.selectorLabels" . | nindent 4 }}
diff --git a/charts/sesamy-gtm/values.schema.json b/charts/sesamy-gtm/values.schema.json
@@ -1422,7 +1422,7 @@
                                   "additionalProperties": false,
                                   "properties": {
                                     "key": {
-                                      "default": "node-role.kubernetes.io/master",
+                                      "default": "node-role.kubernetes.io/control-plane",
                                       "required": [],
                                       "title": "key",
                                       "type": "string"

diff --git a/charts/sesamy-gtm/values.yaml b/charts/sesamy-gtm/values.yaml
@@ -1118,7 +1118,7 @@ scheduling:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
         - matchExpressions:
-            - key: node-role.kubernetes.io/master
+            - key: node-role.kubernetes.io/control-plane
               operator: In
               values: [""]
   # @schema

diff --git a/charts/sesamy-umami/Chart.yaml b/charts/sesamy-umami/Chart.yaml
@@ -15,5 +15,5 @@ annotations:
       url: https://github.com/foomo/helm-charts/tree/main/charts/sesamy-umami
     - name: Umami Source
       url: https://github.com/umami-software/umami
-version: 0.2.0
+version: 0.2.1
 appVersion: 2.15.1
diff --git a/charts/sesamy-umami/README.md b/charts/sesamy-umami/README.md
@@ -1,6 +1,6 @@
 # sesamy-umami
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.15.1](https://img.shields.io/badge/AppVersion-2.15.1-informational?style=flat-square)
+![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.15.1](https://img.shields.io/badge/AppVersion-2.15.1-informational?style=flat-square)
 
 Helm chart for the Sesamy Umami integration.
 
@@ -70,7 +70,7 @@ Helm chart for the Sesamy Umami integration.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/master","operator":"In","values":[""]}]}]}}` | Affinity for pod assignment |
+| scheduling.affinity | object | `{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"node-role.kubernetes.io/control-plane","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 |

diff --git a/charts/sesamy-umami/values.schema.json b/charts/sesamy-umami/values.schema.json
@@ -390,7 +390,7 @@
                                   "additionalProperties": false,
                                   "properties": {
                                     "key": {
-                                      "default": "node-role.kubernetes.io/master",
+                                      "default": "node-role.kubernetes.io/control-plane",
                                       "required": [],
                                       "title": "key",
                                       "type": "string"

diff --git a/charts/sesamy-umami/values.yaml b/charts/sesamy-umami/values.yaml
@@ -804,7 +804,7 @@ scheduling:
     requiredDuringSchedulingIgnoredDuringExecution:
       nodeSelectorTerms:
         - matchExpressions:
-            - key: node-role.kubernetes.io/master
+            - key: node-role.kubernetes.io/control-plane
               operator: In
               values: [""]
   # @schema