From 63d8189c72413f7cc14cb991811858349d02061f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste WATENBERG Date: Fri, 26 Feb 2021 17:28:05 +0100 Subject: [PATCH] ui: Configure navbar so that it displays documentation, plateform and alert menu items --- eve/workers/pod-integration-tests/ui/pod.yaml | 9 +++++++++ salt/metalk8s/addons/ui/deployed/ui.sls.in | 9 +++++++++ ui/cypress/fixtures/shell-config.json | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/eve/workers/pod-integration-tests/ui/pod.yaml b/eve/workers/pod-integration-tests/ui/pod.yaml index 29f616bd4e..ddd47f7e72 100644 --- a/eve/workers/pod-integration-tests/ui/pod.yaml +++ b/eve/workers/pod-integration-tests/ui/pod.yaml @@ -26,6 +26,15 @@ spec: "clientId": "metalk8s-ui", "responseType": "id_token", "scopes": "openid profile email groups offline_access audience:server:client_id:oidc-auth-client" + }, + "options": { + "main": { + "https://localhost:8443/":{ "en": "Plateform", "fr": "Plateforme" }, + "https://localhost:8443/alerts":{ "en": "Alerts", "fr": "Alertes" } + }, + "subLogin": { + "https://localhost:8443/docs":{ "en": "Documentation", "fr": "Documentation" } + } } } EOF diff --git a/salt/metalk8s/addons/ui/deployed/ui.sls.in b/salt/metalk8s/addons/ui/deployed/ui.sls.in index 4ff03832a5..9511a6c973 100644 --- a/salt/metalk8s/addons/ui/deployed/ui.sls.in +++ b/salt/metalk8s/addons/ui/deployed/ui.sls.in @@ -68,6 +68,15 @@ Create shell-ui ConfigMap: "clientId": "metalk8s-ui", "responseType": "id_token", "scopes": "openid profile email groups offline_access audience:server:client_id:oidc-auth-client" + }, + "options": { + "main": { + "https://{{ ingress_control_plane }}/":{ "en": "Plateform", "fr": "Plateforme" }, + "https://{{ ingress_control_plane }}/alerts":{ "en": "Alerts", "fr": "Alertes" } + }, + "subLogin": { + "https://{{ ingress_control_plane }}/docs":{ "en": "Documentation", "fr": "Documentation" } + } } } diff --git a/ui/cypress/fixtures/shell-config.json b/ui/cypress/fixtures/shell-config.json index cabdcd3dcb..f1499624fb 100644 --- a/ui/cypress/fixtures/shell-config.json +++ b/ui/cypress/fixtures/shell-config.json @@ -6,6 +6,15 @@ "clientId": "metalk8s-ui", "responseType": "id_token", "scopes": "openid profile email groups offline_access audience:server:client_id:oidc-auth-client" + }, + "options": { + "main": { + "https://mocked.ingress/":{ "en": "Plateform", "fr": "Plateforme" }, + "https://mocked.ingress/alerts":{ "en": "Alerts", "fr": "Alertes" } + }, + "subLogin": { + "https://mocked.ingress/docs":{ "en": "Documentation", "fr": "Documentation" } + } } } \ No newline at end of file