refactor(llm): simplify redis secrets

Sefaria · Mar 28, 2024 · 9548917 · 9548917
1 parent 7117427
commit 9548917
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/build/ci/production-values.yaml b/build/ci/production-values.yaml
@@ -117,11 +117,9 @@ tasks:
     transportOptions:
       master: mymaster
     redisPassword:
-      secretRef:
-        name: redis-password
+      ref: redis-password
     sentinelPassword:
-      secretRef:
-        name: sentinel-password
+      ref: sentinel-password
   queues:
     llm: llm-llm
 ingress:

diff --git a/helm-chart/sefaria-project/templates/rollout/task.yaml b/helm-chart/sefaria-project/templates/rollout/task.yaml
@@ -93,19 +93,13 @@ spec:
             value: "varnish-{{ .Values.deployEnv }}-{{ .Release.Revision }}"
           - name: HELM_REVISION
             value: "{{ .Release.Revision }}"
+        envFrom:
           {{- if .Values.tasks.enabled }}
-          - name: SENTINEL_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.tasks.redis.sentinelPassword.secretRef.name }}
-                key: {{ .Values.tasks.redis.sentinelPassword.secretRef.key }}
-          - name: REDIS_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.tasks.redis.redisPassword.secretRef.name }}
-                key: {{ .Values.tasks.redis.redisPassword.secretRef.key }}
+          - secretRef:
+              name: {{ .Values.tasks.redis.sentinelPassword.ref }}
+          - secretRef:
+              name: {{ .Values.tasks.redis.redisPassword.ref }}
           {{- end }}
-        envFrom:
           - secretRef:
               name: {{ template "sefaria.secrets.elasticUser" . }}
           - secretRef:

diff --git a/helm-chart/sefaria-project/templates/rollout/web.yaml b/helm-chart/sefaria-project/templates/rollout/web.yaml
@@ -120,9 +120,9 @@ spec:
         envFrom:
           {{- if .Values.tasks.enabled }}
           - secretRef:
-              name: {{ .Values.tasks.redis.sentinelPassword.secretRef.name }}
+              name: {{ .Values.tasks.redis.sentinelPassword.ref }}
           - secretRef:
-              name: {{ .Values.tasks.redis.redisPassword.secretRef.name }}
+              name: {{ .Values.tasks.redis.redisPassword.ref }}
           {{- end }}
           - secretRef:
               name: {{ template "sefaria.secrets.elasticUser" . }}  

diff --git a/helm-chart/sefaria-project/values.yaml b/helm-chart/sefaria-project/values.yaml
@@ -253,11 +253,9 @@ tasks:
     sentinelURL: ""
     transportOptions: {}
     redisPassword:
-      secretRef:
-        name: redis-password
+      ref: redis-password
     sentinelPassword:
-      secretRef:
-        name: sentinel-password
+      ref: sentinel-password
   queues:
     llm: default-llm