Skip to content
This repository has been archived by the owner on Oct 24, 2024. It is now read-only.

Commit

Permalink
explicitly duplicate extraEnvVars
Browse files Browse the repository at this point in the history 
This is an attempt to resolve this helm upgrade error:
> The order in patch list: ... doesn't match $setElementOrder list: ...
  • Loading branch information
@bkiahstroud
bkiahstroud committed Feb 12, 2024
1 parent 98cf7c1 commit 4afc1df
Showing 1 changed file with 311 additions and 3 deletions.
314 changes: 311 additions & 3 deletions ops/dev-deploy.tmpl.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,322 @@ worker:
fsGroup: 101
fsGroupChangePolicy: "OnRootMismatch"
extraVolumeMounts: *volMounts
extraEnvVars: *envVars
extraEnvVars:
- name: SETTINGS__MULTITENANCY__ADMIN_HOST
value: s2.adventistdigitallibrary.org
- name: SETTINGS__MULTITENANCY__ROOT_HOST
value: s2.adventistdigitallibrary.org
- name: SETTINGS__MULTITENANCY__DEFAULT_HOST
value: "%{tenant}.s2.adventistdigitallibrary.org"
- name: CONFDIR
value: "/app/samvera/hyrax-webapp/solr/config"
- name: INITIAL_ADMIN_EMAIL
value: support@notch8.com
- name: INITIAL_ADMIN_PASSWORD
value: testing123
- name: DATABASE_ADAPTER
value: postgresql
- name: DB_ADAPTER
value: postgresql
- name: DATABASE_HOST
value: acid-postgres-cluster-bravo.postgres.svc.cluster.local
- name: DB_HOST
value: acid-postgres-cluster-bravo.postgres.svc.cluster.local
- name: DATABASE_NAME
value: hyku-dev-hyrax
- name: DB_PORT
value: "5432"
- name: DATABASE_USER
value: hyku-dev-hyrax
- name: EXTERNAL_IIIF_URL
value: https://d3pg70bdc74ala.cloudfront.net/iiif/2
- name: FCREPO_BASE_PATH
value: /adventist-dev
- name: FCREPO_HOST
value: fcrepo.default.svc.cluster.local:8080
- name: FCREPO_PATH
value: /rest
- name: FEDORA_URL
value: http://fcrepo.default.svc.cluster.local:8080/rest
- name: AUXILIARY_QUEUE_PRIORITY
value: "100"
- name: IN_DOCKER
value: "true"
- name: LD_LIBRARY_PATH
value: /app/fits/tools/mediainfo/linux
- name: PASSENGER_APP_ENV
value: production
- name: RAILS_CACHE_STORE_URL
value: redis://:$REDIS_PASSWORD@hyku-dev-redis-master:6379/adventist
- name: RAILS_ENV
value: production
- name: RAILS_LOG_TO_STDOUT
value: "true"
- name: RAILS_MAX_THREADS
value: "5"
- name: RAILS_SERVE_STATIC_FILES
value: "true"
- name: REDIS_HOST
value: hyku-dev-redis-master
- name: REDIS_URL
value: redis://:$REDIS_PASSWORD@hyku-dev-redis-master:6379/adventist
- name: SETTINGS__ACTIVE_JOB__QUEUE_ADAPTER
value: good_job
- name: SETTINGS__BULKRAX__ENABLED
value: "true"
- name: SETTINGS__CONTACT_EMAIL
value: support@notch8.com
- name: SETTINGS__DEVISE__INVITATION_FROM_EMAIL
value: support@notch8.com
- name: SETTINGS__FITS_PATH
value: /app/fits/fits.sh
- name: SETTINGS__MULTITENANCY__ADMIN_ONLY_TENANT_CREATION
value: "true"
- name: SETTINGS__MULTITENANCY__DEFAULT_HOST
value: "%{tenant}.s2.adventistdigitallibrary.org"
- name: SETTINGS__MULTITENANCY__ENABLED
value: "true"
- name: SETTINGS__SOLR__COLLECTION_OPTIONS__COLLECTION__CONFIG_NAME
value: hyku-adventist-dev
- name: SETTINGS__SOLR__CONFIGSET
value: hyku-adventist-dev
- name: SETTINGS__ZOOKEEPER__CONNECTION_STR
value: solr-zookeeper-headless.default:2181/configs
- name: SOLR_ADMIN_USER
value: admin
- name: SOLR_COLLECTION_NAME
value: hyku-adventist-dev
- name: SOLR_CONFIGSET_NAME
value: hyku-adventist-dev
- name: SOLR_HOST
value: solr.default
- name: SOLR_PORT
value: "8983"
- name: SOLR_URL
value: http://admin:$SOLR_ADMIN_PASSWORD@solr.default:8983/solr/
- name: SETTINGS__SOLR__URL
value: http://admin:$SOLR_ADMIN_PASSWORD@solr.default:8983/solr/
- name: SMTP_ENABLED
value: "true"
- name: SMTP_USER_NAME
value: fc604e3b82d260
- 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://5ee54fb1e8cd448a9e709c846635ec49@o1008683.ingest.sentry.io/6745020
- name: SENTRY_ENVIRONMENT
value: "staging"
- name: OMP_THREAD_LIMIT
value: "1"
- name: SECRET_KEY_BASE
value: $SECRET_KEY_BASE
- name: AWS_ACCESS_KEY_ID
value: $AWS_ACCESS_KEY_ID
- name: AWS_REGION
value: us-east-1
- name: AWS_S3_BUCKET
value: space-stone-production-preprocessedbucketf21466dd-15sun4xy658nh
- name: AWS_SECRET_ACCESS_KEY
value: $AWS_SECRET_ACCESS_KEY
- name: SERVERLESS_ALTO_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-alto-xml-dlq
- name: SERVERLESS_BATCH_SIZE
value: "10"
- name: SERVERLESS_COPY_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-copy-dlq
- name: SERVERLESS_COPY_SQS_URL
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-copy
- name: SERVERLESS_COPY_URL
value: https://3oqe2l9evk.execute-api.us-east-1.amazonaws.com/copy
- name: SERVERLESS_OCR_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-ocr-dlq
- name: SERVERLESS_OCR_SQS_URL
value: sqs://us-east-1.amazonaws.com/031107666127/space-stone-production-ocr/
- name: SERVERLESS_OCR_THUMB_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-split-ocr-thumbnail-dlq
- name: SERVERLESS_PLAIN_TEXT_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-plain-text-dlq
- name: SERVERLESS_S3_URL
value: s3://space-stone-production-preprocessedbucketf21466dd-15sun4xy658nh.s3.us-east-1.amazonaws.com/
- name: SERVERLESS_SPLIT_SQS_URL
value: sqs://us-east-1.amazonaws.com/031107666127/space-stone-production-split-ocr-thumbnail/
- name: SERVERLESS_TEMPLATE
value: "{{dir_parts[-1..-1]}}/{{ basename }}{{ extension }}"
- name: SERVERLESS_THUMBNAIL_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-thumbnail-dlq
- name: SERVERLESS_THUMBNAIL_SQS_URL
value: sqs://us-east-1.amazonaws.com/031107666127/space-stone-production-thumbnail/
- name: SERVERLESS_WORD_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-word-coordinates-dlq
- name: GOOD_JOB_QUEUES
value: -auxiliary

# When adding/removing key-value pairs to this block, ensure the
# corresponding changes are made in the `extraDeploy` block below.
workerAuxiliary:
extraEnvVars:
- name: SETTINGS__MULTITENANCY__ADMIN_HOST
value: s2.adventistdigitallibrary.org
- name: SETTINGS__MULTITENANCY__ROOT_HOST
value: s2.adventistdigitallibrary.org
- name: SETTINGS__MULTITENANCY__DEFAULT_HOST
value: "%{tenant}.s2.adventistdigitallibrary.org"
- name: CONFDIR
value: "/app/samvera/hyrax-webapp/solr/config"
- name: INITIAL_ADMIN_EMAIL
value: support@notch8.com
- name: INITIAL_ADMIN_PASSWORD
value: testing123
- name: DATABASE_ADAPTER
value: postgresql
- name: DB_ADAPTER
value: postgresql
- name: DATABASE_HOST
value: acid-postgres-cluster-bravo.postgres.svc.cluster.local
- name: DB_HOST
value: acid-postgres-cluster-bravo.postgres.svc.cluster.local
- name: DATABASE_NAME
value: hyku-dev-hyrax
- name: DB_PORT
value: "5432"
- name: DATABASE_USER
value: hyku-dev-hyrax
- name: EXTERNAL_IIIF_URL
value: https://d3pg70bdc74ala.cloudfront.net/iiif/2
- name: FCREPO_BASE_PATH
value: /adventist-dev
- name: FCREPO_HOST
value: fcrepo.default.svc.cluster.local:8080
- name: FCREPO_PATH
value: /rest
- name: FEDORA_URL
value: http://fcrepo.default.svc.cluster.local:8080/rest
- name: AUXILIARY_QUEUE_PRIORITY
value: "100"
- name: IN_DOCKER
value: "true"
- name: LD_LIBRARY_PATH
value: /app/fits/tools/mediainfo/linux
- name: PASSENGER_APP_ENV
value: production
- name: RAILS_CACHE_STORE_URL
value: redis://:$REDIS_PASSWORD@hyku-dev-redis-master:6379/adventist
- name: RAILS_ENV
value: production
- name: RAILS_LOG_TO_STDOUT
value: "true"
- name: RAILS_MAX_THREADS
value: "5"
- name: RAILS_SERVE_STATIC_FILES
value: "true"
- name: REDIS_HOST
value: hyku-dev-redis-master
- name: REDIS_URL
value: redis://:$REDIS_PASSWORD@hyku-dev-redis-master:6379/adventist
- name: SETTINGS__ACTIVE_JOB__QUEUE_ADAPTER
value: good_job
- name: SETTINGS__BULKRAX__ENABLED
value: "true"
- name: SETTINGS__CONTACT_EMAIL
value: support@notch8.com
- name: SETTINGS__DEVISE__INVITATION_FROM_EMAIL
value: support@notch8.com
- name: SETTINGS__FITS_PATH
value: /app/fits/fits.sh
- name: SETTINGS__MULTITENANCY__ADMIN_ONLY_TENANT_CREATION
value: "true"
- name: SETTINGS__MULTITENANCY__DEFAULT_HOST
value: "%{tenant}.s2.adventistdigitallibrary.org"
- name: SETTINGS__MULTITENANCY__ENABLED
value: "true"
- name: SETTINGS__SOLR__COLLECTION_OPTIONS__COLLECTION__CONFIG_NAME
value: hyku-adventist-dev
- name: SETTINGS__SOLR__CONFIGSET
value: hyku-adventist-dev
- name: SETTINGS__ZOOKEEPER__CONNECTION_STR
value: solr-zookeeper-headless.default:2181/configs
- name: SOLR_ADMIN_USER
value: admin
- name: SOLR_COLLECTION_NAME
value: hyku-adventist-dev
- name: SOLR_CONFIGSET_NAME
value: hyku-adventist-dev
- name: SOLR_HOST
value: solr.default
- name: SOLR_PORT
value: "8983"
- name: SOLR_URL
value: http://admin:$SOLR_ADMIN_PASSWORD@solr.default:8983/solr/
- name: SETTINGS__SOLR__URL
value: http://admin:$SOLR_ADMIN_PASSWORD@solr.default:8983/solr/
- name: SMTP_ENABLED
value: "true"
- name: SMTP_USER_NAME
value: fc604e3b82d260
- 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://5ee54fb1e8cd448a9e709c846635ec49@o1008683.ingest.sentry.io/6745020
- name: SENTRY_ENVIRONMENT
value: "staging"
- name: OMP_THREAD_LIMIT
value: "1"
- name: SECRET_KEY_BASE
value: $SECRET_KEY_BASE
- name: AWS_ACCESS_KEY_ID
value: $AWS_ACCESS_KEY_ID
- name: AWS_REGION
value: us-east-1
- name: AWS_S3_BUCKET
value: space-stone-production-preprocessedbucketf21466dd-15sun4xy658nh
- name: AWS_SECRET_ACCESS_KEY
value: $AWS_SECRET_ACCESS_KEY
- name: SERVERLESS_ALTO_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-alto-xml-dlq
- name: SERVERLESS_BATCH_SIZE
value: "10"
- name: SERVERLESS_COPY_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-copy-dlq
- name: SERVERLESS_COPY_SQS_URL
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-copy
- name: SERVERLESS_COPY_URL
value: https://3oqe2l9evk.execute-api.us-east-1.amazonaws.com/copy
- name: SERVERLESS_OCR_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-ocr-dlq
- name: SERVERLESS_OCR_SQS_URL
value: sqs://us-east-1.amazonaws.com/031107666127/space-stone-production-ocr/
- name: SERVERLESS_OCR_THUMB_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-split-ocr-thumbnail-dlq
- name: SERVERLESS_PLAIN_TEXT_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-plain-text-dlq
- name: SERVERLESS_S3_URL
value: s3://space-stone-production-preprocessedbucketf21466dd-15sun4xy658nh.s3.us-east-1.amazonaws.com/
- name: SERVERLESS_SPLIT_SQS_URL
value: sqs://us-east-1.amazonaws.com/031107666127/space-stone-production-split-ocr-thumbnail/
- name: SERVERLESS_TEMPLATE
value: "{{dir_parts[-1..-1]}}/{{ basename }}{{ extension }}"
- name: SERVERLESS_THUMBNAIL_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-thumbnail-dlq
- name: SERVERLESS_THUMBNAIL_SQS_URL
value: sqs://us-east-1.amazonaws.com/031107666127/space-stone-production-thumbnail/
- name: SERVERLESS_WORD_DLQ
value: https://sqs.us-east-1.amazonaws.com/031107666127/space-stone-production-word-coordinates-dlq
- name: GOOD_JOB_QUEUES
value: "*"

Expand Down Expand Up @@ -270,7 +580,6 @@ extraDeploy:
- secretRef:
name: {{ template "hyrax.fullname" . }}
env:
{{- toYaml .Values.extraEnvVars | nindent 12 }}
{{- toYaml .Values.workerAuxiliary.extraEnvVars | nindent 12 }}
command:
- sh
Expand Down Expand Up @@ -305,7 +614,6 @@ extraDeploy:
{{- toYaml . | nindent 12 }}
{{- end }}
env:
{{- toYaml .Values.extraEnvVars | nindent 12 }}
{{- toYaml .Values.workerAuxiliary.extraEnvVars | nindent 12 }}
{{- if .Values.worker.readinessProbe.enabled }}
readinessProbe:
Expand Down

0 comments on commit 4afc1df

Please sign in to comment.