From 20238c86d13d26c2664800deee1d191c1fbe6be3 Mon Sep 17 00:00:00 2001
From: Christian Vogt <cvogt@redhat.com>
Date: Wed, 8 May 2024 14:13:10 -0400
Subject: [PATCH] fix local dev env with external cluster and non-admin user

---
 frontend/config/webpack.dev.js           | 5 ++---
 manifests/base/deployment.yaml           | 8 +-------
 manifests/overlays/rhoai/deployment.yaml | 3 ---
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/frontend/config/webpack.dev.js b/frontend/config/webpack.dev.js
index 6edd813046..56e28f2053 100644
--- a/frontend/config/webpack.dev.js
+++ b/frontend/config/webpack.dev.js
@@ -53,9 +53,8 @@ module.exports = merge(
                 .trim();
             } catch (e) {
               console.info('Failed to GET dashboard route, constructing host manually.');
-              dashboardHost = new URL(execSync(`oc whoami --show-server`).toString()).host
-                .replace(/:\d+$/, '')
-                .replace(/^api./, `${app}-${odhProject}.apps.`);
+              dashboardHost = new URL(execSync(`oc whoami --show-console`).toString()).host
+                .replace(/^[^.]+\./, `${app}-${odhProject}.`);
             }
             console.info('Dashboard host:', dashboardHost);
 
diff --git a/manifests/base/deployment.yaml b/manifests/base/deployment.yaml
index 2bdaa5ea72..d17e034e3c 100644
--- a/manifests/base/deployment.yaml
+++ b/manifests/base/deployment.yaml
@@ -70,12 +70,6 @@ spec:
             name: odh-ca-cert
             subPath: odh-ca-bundle.crt
       - name: oauth-proxy
-        env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
         args:
           - --https-address=:8443
           - --provider=openshift
@@ -88,7 +82,7 @@ spec:
           - --cookie-secret-file=/etc/oauth/config/cookie_secret
           - --cookie-expire=23h0m0s
           - --pass-access-token
-          - '--openshift-delegate-urls={"/": {"resource": "services", "verb": "get", "name": "odh-dashboard", "namespace": "$(NAMESPACE)"}}'
+          - '--openshift-delegate-urls={"/": {"resource": "projects", "verb": "list"}}'
           - --skip-auth-regex=^/metrics
         image: oauth-proxy
         ports:
diff --git a/manifests/overlays/rhoai/deployment.yaml b/manifests/overlays/rhoai/deployment.yaml
index e354ae2417..5ea7548a45 100644
--- a/manifests/overlays/rhoai/deployment.yaml
+++ b/manifests/overlays/rhoai/deployment.yaml
@@ -19,9 +19,6 @@
 - op: replace
   path: /spec/template/spec/containers/0/image
   value: $(odh-dashboard-image)
-- op: replace
-  path: /spec/template/spec/containers/1/args/11
-  value: '--openshift-delegate-urls={"/": {"resource": "services", "verb": "get", "name": "rhods-dashboard", "namespace": "$(NAMESPACE)"}}'
 - op: replace
   path: /spec/template/spec/serviceAccount
   value: rhods-dashboard