From d27608ba97b9e74364ccd83fadc02cac52e9a42f Mon Sep 17 00:00:00 2001
From: adam <athornton@lsst.org>
Date: Thu, 13 Jul 2023 15:02:20 -0700
Subject: [PATCH 1/2] Enable nublado3 at /n3 in IDF prod

---
 applications/nublado/values-idfprod.yaml  | 96 +++++++++++++++++++++++
 applications/postgres/values-idfprod.yaml |  3 +
 environments/values-idfprod.yaml          |  2 +-
 3 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 applications/nublado/values-idfprod.yaml

diff --git a/applications/nublado/values-idfprod.yaml b/applications/nublado/values-idfprod.yaml
new file mode 100644
index 0000000000..57bef7281d
--- /dev/null
+++ b/applications/nublado/values-idfprod.yaml
@@ -0,0 +1,96 @@
+controller:
+  googleServiceAccount: "nublado-controller@science-platform-stable-6994.iam.gserviceaccount.com"
+  slackAlerts: true
+  config:
+    fileserver:
+      enabled: true
+    images:
+      source:
+        type: "google"
+        location: "us-central1"
+        projectId: "rubin-shared-services-71ec"
+        repository: "sciplat"
+        image: "sciplat-lab"
+      recommendedTag: "recommended"
+      numReleases: 1
+      numWeeklies: 2
+      numDailies: 3
+    lab:
+      env:
+        AUTO_REPO_SPECS: "https://github.com/lsst-sqre/system-test@prod,https://github.com/rubin-dp0/tutorial-notebooks@prod"
+        AWS_SHARED_CREDENTIALS_FILE: "/opt/lsst/software/jupyterlab/secrets/aws-credentials.ini"
+        PGPASSFILE: "/opt/lsst/software/jupyterlab/secrets/postgres-credentials.txt"
+        GOOGLE_APPLICATION_CREDENTIALS: "/opt/lsst/software/jupyterlab/secrets/butler-gcs-idf-creds.json"
+        DAF_BUTLER_REPOSITORY_INDEX: "s3://butler-us-central1-repo-locations/data-repos.yaml"
+        HUB_ROUTE: "/n3/hub"
+        S3_ENDPOINT_URL: "https://storage.googleapis.com"
+        NO_ACTIVITY_TIMEOUT: "432000"
+        CULL_KERNEL_IDLE_TIMEOUT: "432000"
+        CULL_TERMINAL_INACTIVE_TIMEOUT: "432000"
+
+      sizes:
+        small:
+          cpu: 1.0
+          memory: 4Gi
+        medium:
+          cpu: 2.0
+          memory: 8Gi
+        large:
+          cpu: 4.0
+          memory: 16Gi
+      initContainers:
+        - name: "initdir"
+          image: "ghcr.io/lsst-sqre/initdir:0.0.4"
+          privileged: true
+          volumes:
+            - containerPath: "/home"
+              mode: "rw"
+              source:
+                serverPath: "/share1/home"
+                server: "10.13.105.122"
+                type: "nfs"
+      secrets:
+        - secretName: "nublado-lab-secret"
+          secretKey: "aws-credentials.ini"
+        - secretName: "nublado-lab-secret"
+          secretKey: "butler-gcs-idf-creds.json"
+        - secretName: "nublado-lab-secret"
+          secretKey: "butler-hmac-idf-creds.json"
+        - secretName: "nublado-lab-secret"
+          secretKey: "postgres-credentials.txt"
+      volumes:
+        - containerPath: "/home"
+          mode: "rw"
+          source:
+            serverPath: "/share1/home"
+            server: "10.13.105.122"
+            type: "nfs"
+        - containerPath: "/project"
+          mode: "rw"
+          source:
+            serverPath: "/share1/project"
+            server: "10.13.105.122"
+            type: "nfs"
+        - containerPath: "/scratch"
+          mode: "rw"
+          source:
+            serverPath: "/share1/scratch"
+            server: "10.13.105.122"
+            type: "nfs"
+
+jupyterhub:
+  hub:
+    baseUrl: "/n3"
+    config:
+      ServerApp:
+        shutdown_no_activity_timeout: 432000
+    db:
+      url: "postgresql://nublado3@postgres.postgres/nublado3"
+
+  cull:
+    enabled: true
+    users: false
+    removeNamedServers: false
+    timeout: 432000
+    every: 300
+    maxAge: 2160000
diff --git a/applications/postgres/values-idfprod.yaml b/applications/postgres/values-idfprod.yaml
index 5a77f93b71..62d07440f7 100644
--- a/applications/postgres/values-idfprod.yaml
+++ b/applications/postgres/values-idfprod.yaml
@@ -1,3 +1,6 @@
 jupyterhub_db:
   user: "jovyan"
   db: "jupyterhub"
+nublado3_db:
+  user: "nublado3"
+  db: "nublado3"
diff --git a/environments/values-idfprod.yaml b/environments/values-idfprod.yaml
index ee89f52121..ef3df38d35 100644
--- a/environments/values-idfprod.yaml
+++ b/environments/values-idfprod.yaml
@@ -32,7 +32,7 @@ narrativelog:
 noteburst:
   enabled: false
 nublado:
-  enabled: false
+  enabled: true
 nublado2:
   enabled: true
 plot-navigator:

From 0c163d0bb2c8267c0068ccdf66ad2dee5b9b10c3 Mon Sep 17 00:00:00 2001
From: adam <athornton@lsst.org>
Date: Thu, 13 Jul 2023 15:22:53 -0700
Subject: [PATCH 2/2] disable WebDAV in nublado/idf-prod

---
 applications/nublado/values-idfprod.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/applications/nublado/values-idfprod.yaml b/applications/nublado/values-idfprod.yaml
index 57bef7281d..71999a9c51 100644
--- a/applications/nublado/values-idfprod.yaml
+++ b/applications/nublado/values-idfprod.yaml
@@ -2,8 +2,6 @@ controller:
   googleServiceAccount: "nublado-controller@science-platform-stable-6994.iam.gserviceaccount.com"
   slackAlerts: true
   config:
-    fileserver:
-      enabled: true
     images:
       source:
         type: "google"