fix(sesamy-gtm): preview autoscaling

foomo · Feb 5, 2025 · ef8800f · ef8800f
1 parent 38d9a6a
commit ef8800f
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 67 deletions.
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 }}