TESTING_IN_CI: deploy-staging-k8-version-1.23.16

.github/workflows/build-test-lint.yaml

@@ -14,10 +14,10 @@ on:
         description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
         required: false
         default: false
-
+# We are using version 14 since this project has not been knap-sackerized yet
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.14
     secrets: inherit
     with:
       platforms: "linux/amd64"
@@ -26,13 +26,13 @@ jobs:
       solrTarget: hyku-solr
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.14
     with:
       webTarget: hyku-base
       workerTarget: hyku-worker
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.14
     with:
       webTarget: hyku-base
       workerTarget: hyku-worker

.github/workflows/deploy.yaml

@@ -17,7 +17,8 @@ on:
         required: false
         default: false
 
+# We are using version 14 since this project has not been knap-sackerized yet
 jobs:
   deploy:
-    uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.14
     secrets: inherit

db/schema.rb

@@ -13,8 +13,10 @@
 ActiveRecord::Schema.define(version: 2023_11_28_200116) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "hstore"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
+  enable_extension "uuid-ossp"
 
   create_table "account_cross_searches", force: :cascade do |t|
     t.bigint "search_account_id"

ops/staging-deploy.tmpl.yaml

@@ -37,6 +37,10 @@ extraVolumeMounts: &volMounts
     mountPath: /app/samvera/hyrax-webapp/tmp/network_files
     subPath: network-files
 
+nginx:
+  service:
+    port: 80
+
 ingress:
   enabled: true
   hosts:
@@ -58,44 +62,14 @@ ingress:
       secretName: notch8cloud
 
 extraEnvVars: &envVars
-  - name: HYKU_ADMIN_HOST
-    value: utk-hyku-staging.notch8.cloud
-  - name: HYKU_ADMIN_ONLY_TENANT_CREATION
-    value: "false"
-  - name: HYKU_DEFAULT_HOST
-    value: "%{tenant}.utk-hyku-staging.notch8.cloud"
-  - name: HYKU_ROOT_HOST
-    value: utk-hyku-staging.notch8.cloud
-  - name: HYKU_MULTITENANT
-    value: "true"
   - name: CONFDIR
     value: "/app/samvera/hyrax-webapp/solr/conf"
-  - name: INITIAL_ADMIN_EMAIL
-    value: admin@example.com
-  - name: INITIAL_ADMIN_PASSWORD
-    value: testing123
-  - name: INITIAL_USER_EMAIL
-    value: user@example.com
-  - name: INITIAL_USER_PASSWORD
-    value: testing123
-  - name: ROB_EMAIL
-    value: rob@notch8.com
-  - name: ROB_PASSWORD
-    value: testing123
-  - name: SUPPORT_EMAIL
-    value: support@notch8.com
-  - name: SUPPORT_PASSWORD
-    value: testing123
-  - name: TEST_USER_EMAIL
-    value: user@notch8.com
-  - name: TEST_USER_PASSWORD
-    value: testing123
   - name: DB_ADAPTER
     value: postgresql
   - name: DB_HOST
     value: pg-postgresql.staging-postgres.svc.cluster.local
   - name: DB_NAME
-    value: utk-hyku-staging-hyrax
+    value: utk-hyku-staging
   - name: DB_PASSWORD
     value: $DB_PASSWORD
   - name: DB_URL
@@ -112,10 +86,42 @@ extraEnvVars: &envVars
     value: http://fcrepo.staging-fcrepo.svc.cluster.local:8080/rest
   - name: GOOD_JOB_MAX_THREADS
     value: "5"
+  - name: HYKU_ACTIVE_JOB_QUEUE_URL
+    value: good_job
+  - name: HYKU_ADMIN_HOST
+    value: utk-hyku-staging.notch8.cloud
+  - name: HYKU_ADMIN_ONLY_TENANT_CREATION
+    value: "false"
+  - name: HYKU_BULKRAX_ENABLED
+    value: "true"
+  - name: HYKU_CONTACT_EMAIL
+    value: support@notch8.com
+  - name: HYKU_DEFAULT_HOST
+    value: "%{tenant}.utk-hyku-staging.notch8.cloud"
+  - name: HYKU_ENABLED
+    value: "true"
   - name: HYKU_FILE_ACL
     value: "true"
+  - name: HYKU_MULTITENANT
+    value: "true"
+  - name: HYKU_ROOT_HOST
+    value: utk-hyku-staging.notch8.cloud
+  - name: HYRAX_ACTIVE_JOB_QUEUE
+    value: good_job
+  - name: HYRAX_FITS_PATH
+    value: /app/fits/fits.sh
+  - name: HYRAX_USE_SOLR_GRAPH_NESTING
+    value: "true"
   - name: IN_DOCKER
     value: "true"
+  - name: INITIAL_ADMIN_EMAIL
+    value: admin@example.com
+  - name: INITIAL_ADMIN_PASSWORD
+    value: testing123
+  - name: INITIAL_USER_EMAIL
+    value: user@example.com
+  - name: INITIAL_USER_PASSWORD
+    value: testing123
   - name: LD_LIBRARY_PATH
     value: /app/fits/tools/mediainfo/linux
   - name: PASSENGER_APP_ENV
@@ -134,20 +140,28 @@ extraEnvVars: &envVars
     value: utk-hyku-staging-redis-master
   - name: REDIS_URL
     value: redis://:$REDIS_PASSWORD@utk-hyku-staging-redis-master:6379/utk-hyku
-  - name: HYKU_ACTIVE_JOB_QUEUE_URL
-    value: good_job
-  - name: HYRAX_ACTIVE_JOB_QUEUE
-    value: good_job
-  - name: HYKU_CONTACT_EMAIL
-    value: support@notch8.com
-  - name: HYRAX_FITS_PATH
-    value: /app/fits/fits.sh
-  - name: HYKU_ENABLED
-    value: "true"
-  - name: HYKU_BULKRAX_ENABLED
-    value: "true"
-  - name: HYRAX_USE_SOLR_GRAPH_NESTING
+  - name: ROB_EMAIL
+    value: rob@notch8.com
+  - name: ROB_PASSWORD
+    value: testing123
+  - name: SENTRY_DSN
+    value: https://ab7f8b39ca414630bd07f6657f57f641@o1008683.ingest.sentry.io/6745049
+  - name: SENTRY_ENVIRONMENT
+    value: staging
+  - name: SMTP_ADDRESS
+    value: smtp.mailtrap.io
+  - name: SMTP_DOMAIN
+    value: smtp.mailtrap.io
+  - name: SMTP_ENABLED
     value: "true"
+  - name: SMTP_PASSWORD
+    value: $SMTP_PASSWORD
+  - name: SMTP_PORT
+    value: "2525"
+  - name: SMTP_TYPE
+    value: cram_md5
+  - name: SMTP_USER_NAME
+    value: d930a4455e9287
   - name: SOLR_ADMIN_PASSWORD
     value: $SOLR_ADMIN_PASSWORD
   - name: SOLR_ADMIN_USER
@@ -162,24 +176,14 @@ extraEnvVars: &envVars
     value: "8983"
   - name: SOLR_URL
     value: http://admin:$SOLR_ADMIN_PASSWORD@solr.staging-solr:8983/solr/
-  - name: SMTP_ENABLED
-    value: "true"
-  - name: SMTP_USER_NAME
-    value: d930a4455e9287
-  - name: SMTP_PASSWORD
-    value: $SMTP_PASSWORD
-  - name: SMTP_ADDRESS
-    value: smtp.mailtrap.io
-  - name: SMTP_DOMAIN
-    value: smtp.mailtrap.io
-  - name: SMTP_PORT
-    value: "2525"
-  - name: SMTP_TYPE
-    value: cram_md5
-  - name: SENTRY_DSN
-    value: https://ab7f8b39ca414630bd07f6657f57f641@o1008683.ingest.sentry.io/6745049
-  - name: SENTRY_ENVIRONMENT
-    value: staging
+  - name: SUPPORT_EMAIL
+    value: support@notch8.com
+  - name: SUPPORT_PASSWORD
+    value: testing123
+  - name: TEST_USER_EMAIL
+    value: user@notch8.com
+  - name: TEST_USER_PASSWORD
+    value: testing123
 
 worker:
   replicaCount: 1
@@ -210,7 +214,7 @@ leaseRelease:
   enabled: false
 
 imagePullSecrets:
-  - name: github-registry
+  - name: github
 
 fcrepo:
   resources:
@@ -239,4 +243,4 @@ externalPostgresql:
 externalSolrPassword: $SOLR_ADMIN_PASSWORD
 externalSolrHost: solr.staging-solr.svc.cluster.local
 externalSolrUser: admin
-externalSolrCollection: "utk-hyku"
+externalSolrCollection: "utk-hyku"