diff --git a/ops/staging-deploy.tmpl.yaml b/ops/staging-deploy.tmpl.yaml index 195bc32..d6a9100 100644 --- a/ops/staging-deploy.tmpl.yaml +++ b/ops/staging-deploy.tmpl.yaml @@ -14,11 +14,11 @@ readinessProbe: enabled: false brandingVolume: - storageClass: aws-efs + storageClass: efs-sc derivativesVolume: - storageClass: aws-efs + storageClass: efs-sc uploadsVolume: - storageClass: aws-efs + storageClass: efs-sc securityContext: &secValues # capabilities: @@ -58,13 +58,17 @@ extraVolumeMounts: &volMounts ingress: enabled: true hosts: - - host: atla-staging.notch8.cloud - paths: - - path: / - host: dl-staging.atla.com paths: - path: / - + annotations: { + kubernetes.io/ingress.class: "nginx", + nginx.ingress.kubernetes.io/proxy-body-size: "0" + } + tls: + - hosts: + - dl-staging.atla.com + secretName: notch8cloud extraEnvVars: &envVars - name: CONFDIR @@ -79,14 +83,22 @@ extraEnvVars: &envVars value: $DATABASE_PASSWORD - name: DATABASE_USER value: hydra_user + - name: DB_HOST + value: hyrax20181216.cn4nhxyoxlnu.us-west-2.rds.amazonaws.com + - name: DB_PORT + value: '5432' + - name: DB_USERNAME + value: hydra_user - name: FCREPO_BASE_PATH value: /staging - name: FCREPO_HOST - value: fcrepo.default + value: fcrepo.fcrepo.svc.cluster.local - name: FCREPO_REST_PATH value: rest + - name: FCREPO_PORT + value: '8080' - name: FEDORA_URL - value: http://fcrepo.default:8080/rest + value: http://fcrepo.fcrepo.svc.cluster.local:8080/rest - name: INITIAL_ADMIN_EMAIL value: support@notch8.com - name: INITIAL_ADMIN_PASSWORD @@ -108,31 +120,35 @@ extraEnvVars: &envVars - name: HYRAX_FITS_PATH value: /app/fits/fits.sh - name: SMTP_ADDRESS - value: smtp.mailtrap.io + value: email-smtp.us-east-1.amazonaws.com - name: SMTP_DOMAIN - value: smtp.mailtrap.io + value: atlamail.org - name: SMTP_ENABLED value: "true" - name: SMTP_PASSWORD value: $SMTP_PASSWORD - name: SMTP_PORT - value: "2525" + value: "587" - name: SMTP_TYPE - value: cram_md5 + value: login - name: SMTP_USER_NAME - value: 857d9918238540 + value: AKIAY76XOZG5JJWFTFV5 + - name: SMTP_STARTTLS + value: "true" - name: SOLR_ADMIN_USER value: admin + - name: SOLR_ADMIN_PASSWORD + value: $SOLR_ADMIN_PASSWORD - name: SOLR_COLLECTION_NAME value: hyrax-staging - name: SOLR_CONFIGSET_NAME value: hyrax - name: SOLR_HOST - value: solr.default + value: solr.solr.svc.cluster.local - name: SOLR_PORT value: "8983" - name: SOLR_URL - value: http://admin:$SOLR_ADMIN_PASSWORD@solr.default:8983/solr/hyrax-staging + value: http://admin:$SOLR_ADMIN_PASSWORD@solr.solr.svc.cluster.local:8983/solr/hyrax-staging - name: RAILS_CACHE_STORE_URL value: redis://:$REDIS_PASSWORD@staging-redis-master:6379/hyrax - name: REDIS_PASSWORD @@ -147,6 +163,8 @@ extraEnvVars: &envVars value: https://bd539e7a5436434dac5abfdab595731a@o1008683.ingest.sentry.io/6745022 - name: DISABLE_SPRING value: "1" + # - name: WORKER_COUNT + # value: "5" worker: replicaCount: 1 @@ -188,15 +206,14 @@ redis: enabled: false password: $REDIS_PASSWORD -externalFcrepoHost: fcrepo.default.svc.cluster.local +externalFcrepoHost: fcrepo.fcrepo.svc.cluster.local externalPostgresql: host: hyrax20181216.cn4nhxyoxlnu.us-west-2.rds.amazonaws.com username: hydra_user password: $DATABASE_PASSWORD database: hydra_staging - -externalSolrHost: solr.default.svc.cluster.local +externalSolrHost: solr.solr.svc.cluster.local externalSolrUser: admin externalSolrCollection: "hyrax-staging" externalSolrPassword: $SOLR_ADMIN_PASSWORD