From 311aaf8e856f5a553695a2dea1e92e08325946fb Mon Sep 17 00:00:00 2001 From: Colin Slater Date: Fri, 1 Nov 2024 15:10:16 -0700 Subject: [PATCH] Fix plot-navigator for embargo_new. --- .../plot-navigator/templates/production-tools-worker.yaml | 2 +- applications/plot-navigator/templates/production-tools.yaml | 2 +- applications/plot-navigator/values-usdfdev.yaml | 1 + applications/plot-navigator/values-usdfint.yaml | 3 ++- applications/plot-navigator/values-usdfprod.yaml | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/applications/plot-navigator/templates/production-tools-worker.yaml b/applications/plot-navigator/templates/production-tools-worker.yaml index 1b233ffee..6c670bf99 100644 --- a/applications/plot-navigator/templates/production-tools-worker.yaml +++ b/applications/plot-navigator/templates/production-tools-worker.yaml @@ -45,7 +45,7 @@ spec: secretKeyRef: name: {{ include "plot-navigator.fullname" . }} key: S3_SECRET - - name: CM_ARQ_REDIS_PASSWORD + - name: REDIS_PASSWORD valueFrom: secretKeyRef: name: redis-secret diff --git a/applications/plot-navigator/templates/production-tools.yaml b/applications/plot-navigator/templates/production-tools.yaml index 093a4e705..f5e8298e9 100644 --- a/applications/plot-navigator/templates/production-tools.yaml +++ b/applications/plot-navigator/templates/production-tools.yaml @@ -45,7 +45,7 @@ spec: secretKeyRef: name: {{ include "plot-navigator.fullname" . }} key: S3_SECRET - - name: CM_ARQ_REDIS_PASSWORD + - name: REDIS_PASSWORD valueFrom: secretKeyRef: name: redis-secret diff --git a/applications/plot-navigator/values-usdfdev.yaml b/applications/plot-navigator/values-usdfdev.yaml index c55c98a50..2e2a42647 100644 --- a/applications/plot-navigator/values-usdfdev.yaml +++ b/applications/plot-navigator/values-usdfdev.yaml @@ -35,6 +35,7 @@ productionTools: PGUSER: "rubin" AWS_SHARED_CREDENTIALS_FILE: "/opt/lsst/butler/secrets/aws-credentials.ini" S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu" + LSST_RESOURCES_S3_PROFILE_embargo: "https://sdfembs3.sdf.slac.stanford.edu" LSST_DISABLE_BUCKET_VALIDATION: "1" REDIS_HOST: "plot-navigator-redis" REDIS_PORT: "6379" diff --git a/applications/plot-navigator/values-usdfint.yaml b/applications/plot-navigator/values-usdfint.yaml index 7412d951f..545ffbe6b 100644 --- a/applications/plot-navigator/values-usdfint.yaml +++ b/applications/plot-navigator/values-usdfint.yaml @@ -28,13 +28,14 @@ config: productionTools: image: repository: ghcr.io/lsst-dm/production_tools - tag: 0.1 + tag: 0.1.1 env: DAF_BUTLER_REPOSITORY_INDEX: "/sdf/group/rubin/shared/data-repos.yaml" PGPASSFILE: "/opt/lsst/butler/secrets/postgres-credentials.txt" PGUSER: "rubin" AWS_SHARED_CREDENTIALS_FILE: "/opt/lsst/butler/secrets/aws-credentials.ini" S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu" + LSST_RESOURCES_S3_PROFILE_embargo: "https://sdfembs3.sdf.slac.stanford.edu" LSST_DISABLE_BUCKET_VALIDATION: "1" REDIS_HOST: "plot-navigator-redis" REDIS_PORT: "6379" diff --git a/applications/plot-navigator/values-usdfprod.yaml b/applications/plot-navigator/values-usdfprod.yaml index 7412d951f..545ffbe6b 100644 --- a/applications/plot-navigator/values-usdfprod.yaml +++ b/applications/plot-navigator/values-usdfprod.yaml @@ -28,13 +28,14 @@ config: productionTools: image: repository: ghcr.io/lsst-dm/production_tools - tag: 0.1 + tag: 0.1.1 env: DAF_BUTLER_REPOSITORY_INDEX: "/sdf/group/rubin/shared/data-repos.yaml" PGPASSFILE: "/opt/lsst/butler/secrets/postgres-credentials.txt" PGUSER: "rubin" AWS_SHARED_CREDENTIALS_FILE: "/opt/lsst/butler/secrets/aws-credentials.ini" S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu" + LSST_RESOURCES_S3_PROFILE_embargo: "https://sdfembs3.sdf.slac.stanford.edu" LSST_DISABLE_BUCKET_VALIDATION: "1" REDIS_HOST: "plot-navigator-redis" REDIS_PORT: "6379"