From c146d32f85028a3d24951013f1f81b9c0bd13661 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey@cvat.ai>
Date: Tue, 27 Dec 2022 22:17:39 +0200
Subject: [PATCH] Allow empty redis pass (#5520)

Fix `Error: UPGRADE FAILED: error validating "": error validating data:
unknown object type "nil" in Secret.stringData.redis-password`
---
 CHANGELOG.md                                | 2 +-
 helm-chart/Chart.yaml                       | 2 +-
 helm-chart/templates/cvat-redis-secret.yml  | 2 +-
 helm-chart/templates/cvat-server-secret.yml | 8 ++++----
 supervisord/utils.conf                      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a0fc6897d5a..2bf82b1b731b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - TDB
 
 ### Fixed
-- TDB
+- Helm: Empty password for Redis (<https://github.com/opencv/cvat/pull/5520>)
 
 ### Security
 - TDB
diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
index 53bebececfe9..420e1dc7689b 100644
--- a/helm-chart/Chart.yaml
+++ b/helm-chart/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 0.5.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm-chart/templates/cvat-redis-secret.yml b/helm-chart/templates/cvat-redis-secret.yml
index d2c0a771e5ad..80378b180943 100644
--- a/helm-chart/templates/cvat-redis-secret.yml
+++ b/helm-chart/templates/cvat-redis-secret.yml
@@ -8,5 +8,5 @@ metadata:
     {{- include "cvat.labels" . | nindent 4 }}
 type: generic
 stringData:
-  redis-password: {{ .Values.redis.secret.password }}
+  redis-password: {{ .Values.redis.secret.password | quote }}
 {{- end }}
diff --git a/helm-chart/templates/cvat-server-secret.yml b/helm-chart/templates/cvat-server-secret.yml
index 388d073d8853..4af93b78f876 100644
--- a/helm-chart/templates/cvat-server-secret.yml
+++ b/helm-chart/templates/cvat-server-secret.yml
@@ -6,8 +6,8 @@ metadata:
   namespace: {{ .Release.Namespace }}
 type: generic
 stringData:
-  googleClientId: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.googleClientId | b64enc }}
-  googleClientSecret: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.googleClientSecret | b64enc }}
-  githubClientId: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.githubClientId | b64enc }}
-  githubClientSecret: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.githubClientSecret | b64enc }}
+  googleClientId: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.googleClientId | quote }}
+  googleClientSecret: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.googleClientSecret | quote }}
+  githubClientId: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.githubClientId | quote }}
+  githubClientSecret: {{ .Values.cvat.backend.server.secret.socialAccountAuthentication.githubClientSecret | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/supervisord/utils.conf b/supervisord/utils.conf
index d5bfafd1a276..13abefde87ae 100644
--- a/supervisord/utils.conf
+++ b/supervisord/utils.conf
@@ -30,7 +30,7 @@ numprocs=1
 
 [program:rqscheduler]
 command=%(ENV_HOME)s/wait-for-it.sh %(ENV_CVAT_REDIS_HOST)s:6379 -t 0 -- bash -ic \
-    "python3 /opt/venv/bin/rqscheduler --host %(ENV_CVAT_REDIS_HOST)s --password %(ENV_CVAT_REDIS_PASSWORD)s -i 30"
+    "python3 /opt/venv/bin/rqscheduler --host %(ENV_CVAT_REDIS_HOST)s --password '%(ENV_CVAT_REDIS_PASSWORD)s' -i 30"
 environment=SSH_AUTH_SOCK="/tmp/ssh-agent.sock"
 numprocs=1