Skip to content

Commit

Permalink
fix(redis): Remove fullnameOverride from redis
Browse files Browse the repository at this point in the history
  • Loading branch information
mjasion committed Jul 13, 2023
1 parent 2bd0779 commit c97cb13
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions charts/studio/templates/configmap-studio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,19 @@ data:
{{- if .Values.global.celery.brokerUrl }}
CELERY_BROKER_URL: {{ .Values.global.celery.brokerUrl }}
{{- else }}
CELERY_BROKER_URL: "redis://{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
CELERY_BROKER_URL: "redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
{{- end }}

{{- if .Values.global.celery.resultBackend }}
CELERY_RESULT_BACKEND: {{ .Values.global.celery.resultBackend }}
{{- else }}
CELERY_RESULT_BACKEND: "redis://{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
CELERY_RESULT_BACKEND: "redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
{{- end }}

{{- if .Values.global.celery.resultBackend }}
REDIS_URL: {{ .Values.global.celery.resultBackend }}
{{- else }}
REDIS_URL: "redis://{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
REDIS_URL: "redis://{{ .Release.Name }}-redis-master.{{ .Release.Namespace }}.svc.cluster.local:6379"
{{- end }}

{{- if .Values.global.scmProviders.github.apiUrl }}
Expand Down
9 changes: 7 additions & 2 deletions charts/studio/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,13 @@ nginx:
redis:
# -- Redis enabled
enabled: true
# -- Redis name override
fullnameOverride: studio-redis

# -- Redis master configuration
master:
# -- Redis master persistence configuration
persistence:
# -- Redis master persistence size in PVC
size: "1Gi"

# -- Redis master configuration
master:

Check failure on line 262 in charts/studio/values.yaml

View workflow job for this annotation

GitHub Actions / lint-test

262:3 [key-duplicates] duplication of key "master" in mapping
Expand Down

0 comments on commit c97cb13

Please sign in to comment.