push update...

UCLALibrary · Nov 27, 2023 · f1c9f75 · f1c9f75
1 parent 1382b3c
commit f1c9f75
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/charts/templates/deployment-worker.yaml b/charts/templates/deployment-worker.yaml
@@ -40,6 +40,29 @@ spec:
                 name: {{ include "chart.fullname" . }}-env
             - secretRef:
                 name: {{ include "chart.fullname" . }}-secrets
+          env:
+            - name: SOLR_ADMIN_USER
+              valueFrom:
+                configMapKeyRef:
+                  name: oralhistory-env
+                  key: SOLR_ADMIN_USER
+            - name: SOLR_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: oralhistory-env
+                  key: SOLR_HOST
+            - name: SOLR_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: oralhistory-env
+                  key: SOLR_PORT
+            - name: SOLR_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: oral-history-secrets
+                  key: SOLR_ADMIN_PASSWORD
+            - name: SOLR_URL
+              value: http://$(SOLR_ADMIN_USER):$(SOLR_ADMIN_PASSWORD)@$(SOLR_HOST):$(SOLR_PORT)/solr/blacklight-core
           ports:
             - name: http
               containerPort: 80

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
@@ -40,6 +40,29 @@ spec:
                 name: {{ include "chart.fullname" . }}-env
             - secretRef:
                 name: {{ include "chart.fullname" . }}-secrets
+          env:
+            - name: SOLR_ADMIN_USER
+              valueFrom:
+                configMapKeyRef:
+                  name: oralhistory-env
+                  key: SOLR_ADMIN_USER
+            - name: SOLR_HOST
+              valueFrom:
+                configMapKeyRef:
+                  name: oralhistory-env
+                  key: SOLR_HOST
+            - name: SOLR_PORT
+              valueFrom:
+                configMapKeyRef:
+                  name: oralhistory-env
+                  key: SOLR_PORT
+            - name: SOLR_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: oral-history-secrets
+                  key: SOLR_ADMIN_PASSWORD
+            - name: SOLR_URL
+              value: http://$(SOLR_ADMIN_USER):$(SOLR_ADMIN_PASSWORD)@$(SOLR_HOST):$(SOLR_PORT)/solr/blacklight-core
           ports:
             - name: http
               containerPort: 80