From 20ec39946d56f863821e2dd374ea4f067ccb38dc Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Thu, 27 Jun 2024 12:14:19 -0700
Subject: [PATCH 1/3] Update Plot Navigator for embargo_or4.

---
 applications/plot-navigator/templates/vault-secrets.yaml | 2 +-
 applications/plot-navigator/values-usdfdev.yaml          | 1 +
 applications/plot-navigator/values-usdfprod.yaml         | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/applications/plot-navigator/templates/vault-secrets.yaml b/applications/plot-navigator/templates/vault-secrets.yaml
index 43310ae6b9..3a22648e85 100644
--- 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
index 365f1e75f4..505748ac2c 100644
--- 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
index 365f1e75f4..60ac287325 100644
--- 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:

From b129ccaa8a4c2363d3f7ad796aa193f9e71b8860 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Thu, 27 Jun 2024 16:02:52 -0700
Subject: [PATCH 2/3] Add resource limits.

---
 applications/plot-navigator/templates/deployment.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/applications/plot-navigator/templates/deployment.yaml b/applications/plot-navigator/templates/deployment.yaml
index fbd8bad61c..64f042b062 100644
--- 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: "50Mi"
+          requests:
+            cpu: "1"
+            memory: "2Gi"
+            ephemeral-storage: "100Mi"

From e38b7b6f4ea80595f0fef055df375c3d9e4edfa5 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Thu, 27 Jun 2024 16:03:00 -0700
Subject: [PATCH 3/3] Container version bump.

---
 applications/plot-navigator/Chart.yaml                | 2 +-
 applications/plot-navigator/templates/deployment.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/plot-navigator/Chart.yaml b/applications/plot-navigator/Chart.yaml
index d7389843ef..2d5ac17db9 100644
--- 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
index 64f042b062..9f293a465b 100644
--- a/applications/plot-navigator/templates/deployment.yaml
+++ b/applications/plot-navigator/templates/deployment.yaml
@@ -71,8 +71,8 @@ spec:
           limits:
             cpu: "2"
             memory: "3Gi"
-            ephemeral-storage: "50Mi"
+            ephemeral-storage: "100Mi"
           requests:
             cpu: "1"
             memory: "2Gi"
-            ephemeral-storage: "100Mi"
+            ephemeral-storage: "50Mi"