Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Commit

Permalink
Allow empty redis pass (cvat-ai#5520)
Browse files Browse the repository at this point in the history
Fix `Error: UPGRADE FAILED: error validating "": error validating data:
unknown object type "nil" in Secret.stringData.redis-password`
  • Loading branch information
azhavoro authored and mikhail-treskin committed Jul 1, 2023
1 parent cbc59ef commit c146d32
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/templates/cvat-redis-secret.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
8 changes: 4 additions & 4 deletions helm-chart/templates/cvat-server-secret.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion supervisord/utils.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit c146d32

Please sign in to comment.