fix tests one more time

datalayer · Dec 16, 2024 · 13d0f4a · 13d0f4a
1 parent 9047d6a
commit 13d0f4a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/charts/datalayer-iam/tests/deployment_test.yaml b/charts/datalayer-iam/tests/deployment_test.yaml
@@ -38,6 +38,16 @@ tests:
           path: spec.template.spec.containers[0]
           content:
             env:
+              - name: DATALAYER_SOLR_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    key: password
+                    name: solr-basic-auth
+              - name: DATALAYER_SOLR_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    key: username
+                    name: solr-basic-auth
               - name: DATALAYER_AUTHZ_ENGINE
                 value: openfga
               - name: DATALAYER_CDN_URL

diff --git a/charts/datalayer-iam/values.yaml b/charts/datalayer-iam/values.yaml
@@ -16,7 +16,7 @@ iam:
             operator: In
             values:
             - "true"
-  envValueFrom:
+  env:
     DATALAYER_SOLR_USERNAME:
       secretKeyRef:
         name: solr-basic-auth
@@ -25,7 +25,6 @@ iam:
       secretKeyRef:
         name: solr-basic-auth
         key: password
-  env:
     DATALAYER_AUTHZ_ENGINE: "openfga"
     DATALAYER_CDN_URL: ""
     DATALAYER_CREDITS_PROVIDER: ""

diff --git a/charts/datalayer-jupyter/tests/deployment_test.yaml b/charts/datalayer-jupyter/tests/deployment_test.yaml
@@ -38,6 +38,16 @@ tests:
           path: spec.template.spec.containers[0]
           content:
             env:
+              - name: DATALAYER_SOLR_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    key: password
+                    name: solr-basic-auth
+              - name: DATALAYER_SOLR_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    key: username
+                    name: solr-basic-auth
               - name: DATALAYER_AUTHZ_ENGINE
                 value: ""
               - name: DATALAYER_CDN_URL

diff --git a/charts/datalayer-jupyter/values.yaml b/charts/datalayer-jupyter/values.yaml
@@ -16,7 +16,7 @@ jupyter:
             operator: In
             values:
             - "true"
-  envValueFrom:
+  env:
     DATALAYER_SOLR_USERNAME:
       secretKeyRef:
         name: solr-basic-auth
@@ -25,7 +25,6 @@ jupyter:
       secretKeyRef:
         name: solr-basic-auth
         key: password
-  env:
     DATALAYER_AUTHZ_ENGINE: ""
     DATALAYER_CDN_URL: ""
     DATALAYER_JWT_ALGORITHM: ""