Merge pull request lsst-sqre#4063 from lsst-sqre/tickets/DM-48359

DM-48359: Enable authentication for exposurelog, narrativelog and nightreport on USDF deployments.
lsst-uk · Jan 20, 2025 · 2c9912a · 2c9912a
2 parents 1663179 + 1e3c576
commit 2c9912a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 6 deletions.
diff --git a/applications/exposurelog/templates/ingress.yaml b/applications/exposurelog/templates/ingress.yaml
@@ -7,10 +7,11 @@ metadata:
 config:
   baseUrl: {{ .Values.global.baseUrl | quote }}
   {{- if .Values.ingress.auth.enabled }}
-  loginRedirect: true
+  loginRedirect: false
   scopes:
-    all:
+    any:
       - "exec:internal-tools"
+      - "exec:notebook"
   service: "exposurelog"
   {{- else }}
   scopes:

diff --git a/applications/exposurelog/values-usdfdev.yaml b/applications/exposurelog/values-usdfdev.yaml
@@ -15,3 +15,6 @@ env:
     value: "/var/secrets/butler/postgres-credentials.txt"
   - name: PGUSER
     value: "rubin"
+ingress:
+  auth:
+    enabled: true
diff --git a/applications/exposurelog/values-usdfprod.yaml b/applications/exposurelog/values-usdfprod.yaml
@@ -15,3 +15,6 @@ env:
     value: "/var/secrets/butler/postgres-credentials.txt"
   - name: PGUSER
     value: "rubin"
+ingress:
+  auth:
+    enabled: true
diff --git a/applications/narrativelog/templates/ingress.yaml b/applications/narrativelog/templates/ingress.yaml
@@ -7,10 +7,11 @@ metadata:
 config:
   baseUrl: {{ .Values.global.baseUrl | quote }}
   {{- if .Values.ingress.auth.enabled }}
-  loginRedirect: true
+  loginRedirect: false
   scopes:
-    all:
+    any:
       - "exec:internal-tools"
+      - "exec:notebook"
   service: "narrativelog"
   {{- else }}
   scopes:

diff --git a/applications/narrativelog/values-usdfdev.yaml b/applications/narrativelog/values-usdfdev.yaml
@@ -3,3 +3,6 @@ config:
 db:
   host: usdf-summitdb.slac.stanford.edu
   user: usdf
+ingress:
+  auth:
+    enabled: true
diff --git a/applications/narrativelog/values-usdfprod.yaml b/applications/narrativelog/values-usdfprod.yaml
@@ -3,3 +3,6 @@ config:
 db:
   host: usdf-summitdb.slac.stanford.edu
   user: usdf
+ingress:
+  auth:
+    enabled: true
diff --git a/applications/nightreport/templates/ingress.yaml b/applications/nightreport/templates/ingress.yaml
@@ -7,10 +7,11 @@ metadata:
 config:
   baseUrl: {{ .Values.global.baseUrl | quote }}
   {{- if .Values.ingress.auth.enabled }}
-  loginRedirect: true
+  loginRedirect: false
   scopes:
-    all:
+    any:
       - "exec:internal-tools"
+      - "exec:notebook"
   service: "nightreport"
   {{- else }}
   scopes:

diff --git a/applications/nightreport/values-usdfdev.yaml b/applications/nightreport/values-usdfdev.yaml
@@ -7,3 +7,6 @@ config:
 db:
   host: usdf-summitdb.slac.stanford.edu
   user: usdf
+ingress:
+  auth:
+    enabled: true