Merge branch 'main' into ci/release_notes

keephq · Feb 4, 2025 · 75a3333 · 75a3333
2 parents 19416e1 + a87f033
commit 75a3333
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/charts/keep/Chart.yaml b/charts/keep/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: keep
-version: 0.1.59
+version: 0.1.60
 description: Keep Helm Chart
 type: application
 icon: https://platform.keephq.dev/_next/image?url=%2Fkeep.png&w=48&q=75

diff --git a/charts/keep/templates/backend.yaml b/charts/keep/templates/backend.yaml
@@ -104,7 +104,7 @@ spec:
         {{- if .Values.backend.waitForDatabase.enabled }}
         - name: wait-for-database
           image: busybox
-          command: ['sh', '-c', 'until nc -z {{ include "keep.findEnvVar" (list "DATABASE_NAME" .) | default "keep-database" }} {{ .Values.backend.waitForDatabase.port }}; do sleep 1; done;']
+          command: ['sh', '-c', 'until nc -z {{ include "keep.findBackendEnvVar" (list "DATABASE_NAME" .) | default "keep-database" }} {{ .Values.backend.waitForDatabase.port }}; do sleep 1; done;']
         {{- end }}
         {{- range .Values.backend.extraInitContainers }}
         - name: {{ .name }}
@@ -130,6 +130,10 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.backend.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.backend.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/keep/templates/frontend.yaml b/charts/keep/templates/frontend.yaml
@@ -76,6 +76,10 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.backend.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.frontend.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/keep/templates/websocket-server.yaml b/charts/keep/templates/websocket-server.yaml
@@ -61,6 +61,10 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.backend.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.websocket.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/keep/values.yaml b/charts/keep/values.yaml
@@ -122,6 +122,7 @@ backend:
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
   nodeSelector: {}
+  topologySpreadConstraints: []
   tolerations: []
   affinity: {}
   healthCheck:
@@ -195,6 +196,7 @@ frontend:
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
   nodeSelector: {}
+  topologySpreadConstraints: []
   tolerations: []
   affinity: {}
   healthCheck:
@@ -248,6 +250,7 @@ websocket:
     targetCPUUtilizationPercentage: 80
     targetMemoryUtilizationPercentage: 80
   nodeSelector: {}
+  topologySpreadConstraints: []
   tolerations: []
   affinity: {}
   healthCheck: