upgraded dependencies, fixed app version tag and repo

getredash · Apr 11, 2024 · 413744e · 413744e
1 parent 0c66dc4
commit 413744e
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 57 deletions.
diff --git a/requirements.lock b/requirements.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 18.19.4
+  version: 19.1.0
 - name: postgresql
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 13.4.6
-digest: sha256:bf1381bd95e1b7b7b93fc6e69ebc9c40c46ac7d39e6cbfa148e626b17f4d319c
-generated: "2024-03-27T00:08:04.068636333+02:00"
+  version: 15.2.5
+digest: sha256:737414ecea2a8b28eb5170ec23dcc35251a77836e71283623d29874c4404159c
+generated: "2024-04-11T10:04:30.905003+03:00"
diff --git a/requirements.yaml b/requirements.yaml
@@ -1,9 +1,9 @@
 dependencies:
   - name: redis
-    version: "^18.9.0"
+    version: "^19.1.0"
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: redis.enabled
   - name: postgresql
-    version: "^13.4.1"
+    version: "^15.2.0"
     repository: oci://registry-1.docker.io/bitnamicharts
     condition: postgresql.enabled
diff --git a/templates/hook-migrations-job.yaml b/templates/hook-migrations-job.yaml
@@ -15,21 +15,21 @@ spec:
   template:
     metadata:
       name: "{{ .Release.Name }}"
-      labels: {{- include "redash.selectorLabels" . | nindent 8 }}
+      labels: {{ include "redash.selectorLabels" . | nindent 8 }}
       {{- with .Values.migrations.podAnnotations }}
       annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
-      imagePullSecrets: {{- toYaml . | nindent 8 }}
+      imagePullSecrets: {{ toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "redash.serviceAccountName" . }}
       restartPolicy: Never
-      securityContext: {{- toYaml .Values.migrations.podSecurityContext | nindent 8 }}
+      securityContext: {{ toYaml .Values.migrations.podSecurityContext | nindent 8 }}
       containers:
       - name: {{ include "redash.name" . }}-server
-        securityContext: {{- toYaml .Values.migrations.securityContext | nindent 10 }}
-        image: "{{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag }}"
+        securityContext: {{ toYaml .Values.migrations.securityContext | nindent 10 }}
+        image: "{{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args:
           - create_db

diff --git a/templates/scheduler-deployment.yaml b/templates/scheduler-deployment.yaml
@@ -18,28 +18,28 @@ spec:
       labels:
         {{- include "redash.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: scheduler
-        {{- if .Values.scheduler.podLabels }}
-        {{- tpl (toYaml .Values.scheduler.podLabels) $ | nindent 8 }}
+        {{- with .Values.scheduler.podLabels }}
+        {{- tpl (toYaml .) $ | nindent 8 }}
         {{- end }}
       {{- if .Values.scheduler.podAnnotations }}
       annotations: {{ toYaml .Values.scheduler.podAnnotations | nindent 8 }}
       {{- end }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets: {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{ with .Values.imagePullSecrets -}}
+      imagePullSecrets: {{ toYaml . | nindent 8 }}
+      {{ end -}}
       serviceAccountName: {{ include "redash.serviceAccountName" . }}
-      securityContext: {{- toYaml .Values.scheduler.podSecurityContext | nindent 8 }}
+      securityContext: {{ toYaml .Values.scheduler.podSecurityContext | nindent 8 }}
       containers:
         {{- with .Values.scheduler.extraContainers -}}
-        {{- toYaml . | nindent 8 }}
+        {{ toYaml . | nindent 8 }}
         {{- end }}
         - name: {{ include "redash.name" . }}-scheduler
-          securityContext: {{- toYaml .Values.scheduler.securityContext | nindent 12 }}
-          image: {{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag }}
+          securityContext: {{ toYaml .Values.scheduler.securityContext | nindent 12 }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.scheduler.volumeMounts }}
-          volumeMounts: {{- toYaml . | nindent 12 }}
+          volumeMounts: {{ toYaml . | nindent 12 }}
           {{- end }}
           args:
             - scheduler
@@ -49,15 +49,14 @@ spec:
             - name: "{{ $key }}"
               value: "{{ $value }}"
           {{- end }}
-          {{- if (include "redash.envFrom" .) }}
-          envFrom:
-          {{- include "redash.envFrom" . | nindent 12 }}
+          {{- with (include "redash.envFrom" .) }}
+          envFrom: {{ . | nindent 12 }}
           {{- end }}
-          {{- if .Values.scheduler.resources }}
-          resources: {{ toYaml .Values.scheduler.resources | nindent 12 }}
+          {{- with .Values.scheduler.resources }}
+          resources: {{ toYaml . | nindent 12 }}
           {{- end }}
       {{- with .Values.scheduler.volumes }}
-      volumes: {{- toYaml . | nindent 8 }}
+      volumes: {{ toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.scheduler.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}

diff --git a/templates/server-deployment.yaml b/templates/server-deployment.yaml
@@ -19,26 +19,25 @@ spec:
         {{- if .Values.server.podLabels }}
         {{- tpl (toYaml .Values.server.podLabels) $ | nindent 8 }}
         {{- end }}
-      {{- if .Values.server.podAnnotations }}
-      annotations:
-      {{ toYaml .Values.server.podAnnotations | nindent 8 }}
+      {{- with .Values.server.podAnnotations }}
+      annotations: {{ toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets: {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{ with .Values.imagePullSecrets -}}
+      imagePullSecrets: {{ toYaml . | nindent 8 }}
+      {{ end -}}
       serviceAccountName: {{ include "redash.serviceAccountName" . }}
-      securityContext: {{- toYaml .Values.server.podSecurityContext | nindent 8 }}
+      securityContext: {{ toYaml .Values.server.podSecurityContext | nindent 8 }}
       containers:
         {{- with .Values.server.extraContainers -}}
         {{- toYaml . | nindent 8 }}
         {{- end }}
         - name: {{ include "redash.name" . }}-server
-          securityContext: {{- toYaml .Values.server.securityContext | nindent 12 }}
-          image: {{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag }}
+          securityContext: {{ toYaml .Values.server.securityContext | nindent 12 }}
+          image: {{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.server.volumeMounts }}
-          volumeMounts: {{- toYaml . | nindent 12 }}
+          volumeMounts: {{ toYaml . | nindent 12 }}
           {{- end }}
           args:
             - server
@@ -48,9 +47,8 @@ spec:
             - name: "{{ $key }}"
               value: "{{ $value }}"
           {{- end }}
-          {{- if (include "redash.envFrom" .) }}
-          envFrom:
-          {{- include "redash.envFrom" . | nindent 12 }}
+          {{ with (include "redash.envFrom" .) -}}
+          envFrom: {{ . | nindent 12 }}
           {{- end }}
           ports:
             - containerPort: {{ .Values.server.httpPort }}
@@ -73,11 +71,11 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             failureThreshold: 3
-          {{- if .Values.server.resources }}
+          {{- with .Values.server.resources }}
           resources: {{ toYaml .Values.server.resources | nindent 12 }}
           {{- end }}
       {{- with .Values.server.volumes }}
-      volumes: {{- toYaml . | nindent 8 }}
+      volumes: {{ toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.server.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}

diff --git a/templates/worker-deployment.yaml b/templates/worker-deployment.yaml
@@ -15,7 +15,7 @@ spec:
     metadata:
       labels: {{ include "redash.selectorLabels" $context | nindent 8 }}
       {{- if $workerConfig.podLabels }}
-        {{ tpl (toYaml $workerConfig.podLabels) $ | nindent 8 }}
+      {{ tpl (toYaml $workerConfig.podLabels) $ | nindent 8 }}
       {{- end }}
       {{- with $workerConfig.podAnnotations -}}
       annotations: {{ toYaml . | nindent 8 }}
@@ -32,7 +32,7 @@ spec:
         {{- end }}
         - name: {{ include "redash.name" $context }}-{{ $workerName }}worker
           securityContext: {{ toYaml $workerConfig.securityContext | nindent 12 }}
-          image: {{ $.Values.image.registry }}/{{ $.Values.image.repo }}:{{ $.Values.image.tag }}
+          image: {{ $.Values.image.registry }}/{{ $.Values.image.repo }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           args: 
             - worker
@@ -46,23 +46,22 @@ spec:
             - name: "{{ $key }}"
               value: "{{ $value }}"
           {{- end }}
-          {{ if (include "redash.envFrom" $) }}
-          envFrom:
-          {{- include "redash.envFrom" $ | nindent 12 }}
+          {{- with (include "redash.envFrom" $) }}
+          envFrom: {{ . | nindent 12 }}
           {{- end }}
           {{- with $workerConfig.resources }}
           resources: {{ toYaml . | nindent 12 }}
           {{- end }}
-      {{ with $workerConfig.volumes -}}
-      volumes:{{ toYaml . | nindent 8 }}
-      {{- end -}}
-      {{ with $workerConfig.nodeSelector -}}
+      {{- with $workerConfig.volumes }}
+      volumes: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with $workerConfig.nodeSelector }}
       nodeSelector: {{ toYaml . | nindent 8 }}
-      {{- end -}}
-      {{ with $workerConfig.affinity -}}
+      {{- end }}
+      {{- with $workerConfig.affinity }}
       affinity: {{ toYaml . | nindent 8 }}
-      {{- end -}}
-      {{ with $workerConfig.tolerations -}}
+      {{- end }}
+      {{- with $workerConfig.tolerations }}
       tolerations: {{ toYaml . | nindent 8 }}
       {{- end }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
@@ -3,9 +3,9 @@
 image:
   registry: docker.io
   # image.repo -- Redash image name used for server and worker pods
-  repo: redash/redash
+  repo: redash/preview
   # image.tag -- Redash image [tag](https://hub.docker.com/r/redash/redash/tags)
-  tag: 10.1.0.b50633
+  tag:
   # image.pullPolicy - Image pull policy
   pullPolicy: IfNotPresent