Merge branch 'main' into wdn/pg-fix-2899128

nycmeshnet · Dec 4, 2024 · 3cc132a · 3cc132a
2 parents 2d3e4e1 + 81f39be
commit 3cc132a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/infra/helm/meshdb/charts/celery/templates/deployment.yaml b/infra/helm/meshdb/charts/celery/templates/deployment.yaml
@@ -44,9 +44,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: meshdbconfig
-          envFrom:
-          - secretRef:
-              name: meshdb-secrets
+            - secretRef:
+                name: meshdb-secrets
           {{- if .livenessProbe }}
           livenessProbe:
             {{- toYaml .livenessProbe | nindent 12 }}

diff --git a/infra/helm/meshdb/templates/meshweb.yaml b/infra/helm/meshdb/templates/meshweb.yaml
@@ -40,9 +40,8 @@ spec:
           envFrom:
             - configMapRef:
                 name: meshdbconfig
-          envFrom:
-          - secretRef:
-              name: meshdb-secrets
+            - secretRef:
+                name: meshdb-secrets
           volumeMounts:
             - name: static-content-vol
               mountPath: /opt/meshdb/static