From 623d2aca252d5600c38b5e48092ff0a3efc23d30 Mon Sep 17 00:00:00 2001 From: Christian Vogt 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 | 2 +- 2 files changed, 3 insertions(+), 4 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..cb18345d12 100644 --- a/manifests/base/deployment.yaml +++ b/manifests/base/deployment.yaml @@ -88,7 +88,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: