Skip to content

Commit 2a16e11

Browse files
committed
chore(passport): unified reids declaration
1 parent 6d95c50 commit 2a16e11

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

charts/passport/templates/_helpers.tpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ rbac.authorization.k8s.io/v1
1313

1414
{{/* Generate passport deployment envs */}}
1515
{{- define "passport.envs" }}
16-
{{ $redisNodeCount := .Values.redis.replicas | int }}
1716
env:
1817
- name: "TZ"
1918
value: {{ .Values.time_zone | default "UTC" | quote }}
@@ -88,16 +87,11 @@ env:
8887
- name: DRYCC_DATABASE_URL
8988
value: "postgres://$(DRYCC_DATABASE_USER):$(DRYCC_DATABASE_PASSWORD)@$(DRYCC_DATABASE_SERVICE_HOST):$(DRYCC_DATABASE_SERVICE_PORT)/passport"
9089
{{- end }}
91-
{{- if eq .Values.global.redisLocation "on-cluster"}}
92-
- name: DRYCC_REDIS_ADDRS
93-
value: "{{range $i := until $redisNodeCount}}drycc-redis-{{$i}}.drycc-redis.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:6379{{if lt (add 1 $i) $redisNodeCount}},{{end}}{{end}}"
94-
{{- else if eq .Values.global.redisLocation "off-cluster" }}
9590
- name: DRYCC_REDIS_ADDRS
9691
valueFrom:
9792
secretKeyRef:
9893
name: redis-creds
9994
key: addrs
100-
{{- end }}
10195
- name: DRYCC_REDIS_PASSWORD
10296
valueFrom:
10397
secretKeyRef:

0 commit comments

Comments
 (0)