more deploy fixes (#1889)

samvera · Jan 13, 2023 · f077f46 · f077f46
1 parent 27be626
commit f077f46
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -45,6 +45,8 @@ jobs:
       REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
       SECRET_KEY_BASE: ${{ secrets.SECRET_KEY_BASE }}
       SENDGRID_PASSWORD: ${{ secrets.SENDGRID_PASSWORD }}
+      SENTRY_ENVIRONMENT: ${{ secrets.SENTRY_ENVIRONMENT }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }}
       SOLR_ADMIN_PASSWORD: ${{ secrets.SOLR_ADMIN_PASSWORD }}
       SQUARE_ACCESS_TOKEN: ${{ secrets.SQUARE_ACCESS_TOKEN }}

diff --git a/ops/demo-deploy.tmpl.yaml b/ops/demo-deploy.tmpl.yaml
@@ -148,6 +148,8 @@ extraEnvVars: &envVars
     value: cram_md5
   - name: SOLR_ADMIN_USER
     value: admin
+  - name: SOLR_ADMIN_PASSWORD
+    value: $SOLR_ADMIN_PASSWORD
   - name: SOLR_COLLECTION_NAME
     value: hyku-demo
   - name: SOLR_CONFIGSET_NAME
@@ -157,12 +159,13 @@ extraEnvVars: &envVars
   - name: SOLR_PORT
     value: "8983"
   - name: SOLR_URL
-    value: http://admin:$SOLR_PASSWORD@solr.staging-solr:8983/solr/
+    value: http://admin:$SOLR_ADMIN_PASSWORD@solr.staging-solr:8983/solr/
   - name: SECRET_KEY_BASE
     value: $SECRET_KEY_BASE
   - name: SENTRY_DSN
     value: $SENTRY_DSN
-
+  - name: SENTRY_ENVIRONMENT
+    value: $SENTRY_ENVIRONMENT
 worker:
   replicaCount: 1
   extraVolumeMounts: *volMounts
@@ -204,7 +207,7 @@ externalPostgresql:
 externalSolrHost: solr.staging-solr.svc.cluster.local
 externalSolrUser: admin
 externalSolrCollection: "hyku-demo"
-externalSolrPassword: $SOLR_PASSWORD
+externalSolrPassword: $SOLR_ADMIN_PASSWORD
 
 global:
   hyraxName: hyku-demo-hyrax

diff --git a/ops/iiif-deploy.tmpl.yaml b/ops/iiif-deploy.tmpl.yaml
@@ -148,6 +148,8 @@ extraEnvVars: &envVars
     value: cram_md5
   - name: SOLR_ADMIN_USER
     value: admin
+  - name: SOLR_ADMIN_PASSWORD
+    value: $SOLR_ADMIN_PASSWORD
   - name: SOLR_COLLECTION_NAME
     value: hyku-iiif
   - name: SOLR_CONFIGSET_NAME
@@ -157,11 +159,13 @@ extraEnvVars: &envVars
   - name: SOLR_PORT
     value: "8983"
   - name: SOLR_URL
-    value: http://admin:$SOLR_PASSWORD@solr.staging-solr:8983/solr/
+    value: http://admin:$SOLR_ADMIN_PASSWORD@solr.staging-solr:8983/solr/
   - name: SECRET_KEY_BASE
     value: $SECRET_KEY_BASE
   - name: SENTRY_DSN
     value: $SENTRY_DSN
+  - name: SENTRY_ENVIRONMENT
+    value: $SENTRY_ENVIRONMENT
 
 worker:
   replicaCount: 1
@@ -204,7 +208,7 @@ externalPostgresql:
 externalSolrHost: solr.staging-solr.svc.cluster.local
 externalSolrUser: admin
 externalSolrCollection: "hyku-iiif"
-externalSolrPassword: $SOLR_PASSWORD
+externalSolrPassword: $SOLR_ADMIN_PASSWORD
 
 global:
   hyraxName: hyku-iiif-hyrax

diff --git a/ops/staging-deploy.tmpl.yaml b/ops/staging-deploy.tmpl.yaml
@@ -150,7 +150,9 @@ extraEnvVars: &envVars
     value: cram_md5
   - name: SOLR_ADMIN_USER
     value: admin
-  - name: SOLR_COLLECTION_NAME
+  - name: SOLR_ADMIN_PASSWORD
+    value: $SOLR_ADMIN_PASSWORD
+ - name: SOLR_COLLECTION_NAME
     value: hyku-staging
   - name: SOLR_CONFIGSET_NAME
     value: hyku-staging
@@ -159,11 +161,13 @@ extraEnvVars: &envVars
   - name: SOLR_PORT
     value: "8983"
   - name: SOLR_URL
-    value: http://admin:$SOLR_PASSWORD@solr.staging-solr:8983/solr/
+    value: http://admin:$SOLR_ADMIN_PASSWORD@solr.staging-solr:8983/solr/
   - name: SECRET_KEY_BASE
     value: $SECRET_KEY_BASE
   - name: SENTRY_DSN
     value: $SENTRY_DSN
+  - name: SENTRY_ENVIRONMENT
+    value: $SENTRY_ENVIRONMENT
 
 worker:
   replicaCount: 1
@@ -206,7 +210,7 @@ externalPostgresql:
 externalSolrHost: solr.staging-solr.svc.cluster.local
 externalSolrUser: admin
 externalSolrCollection: "hyku-staging"
-externalSolrPassword: $SOLR_PASSWORD
+externalSolrPassword: $SOLR_ADMIN_PASSWORD
 
 global:
   hyraxName: hyku-staging-hyrax