Merge pull request #3472 from lsst-sqre/u/ctslater/plots_embargo_or4

Update plot-navigator to support embargo_or4
lsst-sqre · Jun 28, 2024 · 8617810 · 8617810
2 parents add3a93 + e38b7b6
commit 8617810
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/applications/plot-navigator/Chart.yaml b/applications/plot-navigator/Chart.yaml
@@ -4,4 +4,4 @@ description: Panel-based plot viewer
 version: 1.0.0
 sources:
   - https://github.com/lsst-dm/pipetask-plot-navigator
-appVersion: "0.11.0"
+appVersion: "0.11.2"
diff --git a/applications/plot-navigator/templates/deployment.yaml b/applications/plot-navigator/templates/deployment.yaml
@@ -67,3 +67,12 @@ spec:
           - /bin/bash
           - -c
           - panel serve dashboard_gen3.py --port 8080 --prefix /plot-navigator --allow-websocket-origin {{ .Values.global.host }} --static-dirs assets=./assets
+        resources:
+          limits:
+            cpu: "2"
+            memory: "3Gi"
+            ephemeral-storage: "100Mi"
+          requests:
+            cpu: "1"
+            memory: "2Gi"
+            ephemeral-storage: "50Mi"
diff --git a/applications/plot-navigator/templates/vault-secrets.yaml b/applications/plot-navigator/templates/vault-secrets.yaml
@@ -8,6 +8,6 @@ spec:
 {{- if .Values.config.separateSecrets }}
   path: "{{ .Values.global.vaultSecretsPath }}/plot-navigator"
 {{- else }}
-  path: "{{ .Values.global.vaultSecretsPath }}/butler-secret"
+  path: "{{ .Values.global.vaultSecretsPath }}/nublado-lab-secret"
 {{- end }}
   type: Opaque
diff --git a/applications/plot-navigator/values-usdfdev.yaml b/applications/plot-navigator/values-usdfdev.yaml
@@ -6,6 +6,7 @@ environment:
   S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
   BUTLER_DEFAULT_REPO: "/repo/main"
   BUTLER_DEFAULT_COLLECTION: "HSC/runs/RC2/w_2024_02/DM-42454"
+  LSST_DISABLE_BUCKET_VALIDATION: "1"
 
 config:
   volumes:

diff --git a/applications/plot-navigator/values-usdfprod.yaml b/applications/plot-navigator/values-usdfprod.yaml
@@ -6,6 +6,8 @@ environment:
   S3_ENDPOINT_URL: "https://s3dfrgw.slac.stanford.edu"
   BUTLER_DEFAULT_REPO: "/repo/main"
   BUTLER_DEFAULT_COLLECTION: "HSC/runs/RC2/w_2024_02/DM-42454"
+  LSST_DISABLE_BUCKET_VALIDATION: "1"
+  LSST_RESOURCES_S3_PROFILE_embargo: "https://sdfembs3.sdf.slac.stanford.edu"
 
 config:
   volumes: