From 13d0f4a49a6b03e3ca739695d07959e9682b7425 Mon Sep 17 00:00:00 2001
From: Tennison Yu <tennisonyu@gmail.com>
Date: Mon, 16 Dec 2024 12:44:19 -0500
Subject: [PATCH] fix tests one more time

---
 charts/datalayer-iam/tests/deployment_test.yaml     | 10 ++++++++++
 charts/datalayer-iam/values.yaml                    |  3 +--
 charts/datalayer-jupyter/tests/deployment_test.yaml | 10 ++++++++++
 charts/datalayer-jupyter/values.yaml                |  3 +--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/charts/datalayer-iam/tests/deployment_test.yaml b/charts/datalayer-iam/tests/deployment_test.yaml
index a6a5133..69a206a 100644
--- 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
index 0aab94e..fd87299 100644
--- 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
index 9f0c46e..4e376c1 100644
--- 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
index 740798f..1a95221 100644
--- 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: ""