From d0aa7bbcf1814ed7f0a9aa70d2c1fa99d13effd8 Mon Sep 17 00:00:00 2001 From: Andrew Chubatiuk Date: Thu, 11 Apr 2024 10:08:06 +0300 Subject: [PATCH] upgraded dependencies, fixed app version tag and repo --- requirements.lock | 8 ++++---- requirements.yaml | 4 ++-- templates/hook-migrations-job.yaml | 10 +++++----- templates/scheduler-deployment.yaml | 12 ++++++------ templates/server-deployment.yaml | 12 ++++++------ templates/worker-deployment.yaml | 2 +- values.yaml | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/requirements.lock b/requirements.lock index 6ec06ce..e9564ac 100644 --- 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 index ef82f46..fae458e 100644 --- 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 index af658df..8b396ab 100644 --- 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 index 604d04f..6cda495 100644 --- a/templates/scheduler-deployment.yaml +++ b/templates/scheduler-deployment.yaml @@ -26,20 +26,20 @@ spec: {{- end }} spec: {{- with .Values.imagePullSecrets }} - imagePullSecrets: {{- toYaml . | nindent 8 }} + 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 }} {{- 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 @@ -57,7 +57,7 @@ spec: resources: {{ toYaml .Values.scheduler.resources | 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 index e4cb033..58fa4f0 100644 --- a/templates/server-deployment.yaml +++ b/templates/server-deployment.yaml @@ -25,20 +25,20 @@ spec: {{- end }} spec: {{- with .Values.imagePullSecrets }} - imagePullSecrets: {{- toYaml . | nindent 8 }} + 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 @@ -77,7 +77,7 @@ spec: 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 index c2ab65d..76d426d 100644 --- a/templates/worker-deployment.yaml +++ b/templates/worker-deployment.yaml @@ -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 diff --git a/values.yaml b/values.yaml index c8d0c64..3522d27 100644 --- 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