refactor(llm): use envFrom to get redis secrets

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

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/build/ci/production-values.yaml b/build/ci/production-values.yaml
@@ -119,11 +119,9 @@ tasks:
     redisPassword:
       secretRef:
         name: redis-password
-        key: REDIS_PASSWORD
     sentinelPassword:
       secretRef:
         name: sentinel-password
-        key: SENTINEL_PASSWORD
   queues:
     llm: llm-llm
 ingress:

diff --git a/helm-chart/sefaria-project/templates/rollout/web.yaml b/helm-chart/sefaria-project/templates/rollout/web.yaml
@@ -117,19 +117,13 @@ spec:
           - name: OTEL_RESOURCE_ATTRIBUTES
             value: k8s.container.name=app,k8s.deployment.name={{ .Values.deployEnv }}-web,k8s.namespace.name={{ .Release.Namespace }},k8s.node.name=$(OTEL_RESOURCE_ATTRIBUTES_NODE_NAME),k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)
           {{- end }}
+        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.secretRef.name }}
+          - secretRef:
+              name: {{ .Values.tasks.redis.redisPassword.secretRef.name }}
           {{- end }}
-        envFrom:
           - secretRef:
               name: {{ template "sefaria.secrets.elasticUser" . }}  
           - secretRef:

diff --git a/helm-chart/sefaria-project/values.yaml b/helm-chart/sefaria-project/values.yaml
@@ -255,11 +255,9 @@ tasks:
     redisPassword:
       secretRef:
         name: redis-password
-        key: REDIS_PASSWORD
     sentinelPassword:
       secretRef:
         name: sentinel-password
-        key: SENTINEL_PASSWORD
   queues:
     llm: default-llm