diff --git a/charts/digitalhub/Chart.yaml b/charts/digitalhub/Chart.yaml index 5789cfd0..2f1e21e8 100644 --- a/charts/digitalhub/Chart.yaml +++ b/charts/digitalhub/Chart.yaml @@ -7,7 +7,7 @@ maintainers: url: https://github.com/ffais - name: calcagiara url: https://github.com/Calcagiara -version: "0.8.0-beta1" +version: "0.8.0-beta2" appVersion: "0.8.0" dependencies: - name: apigw-operator @@ -19,11 +19,11 @@ dependencies: repository: https://helm.coder.com/v2 condition: coder.enabled - name: core - version: "0.2.14" + version: "0.2.16" repository: https://scc-digitalhub.github.io/digitalhub/ condition: core.enabled - name: kubernetes-resource-manager - version: "0.2.3" + version: "0.2.4" repository: https://scc-digitalhub.github.io/digitalhub/ condition: kubernetes-resource-manager.enabled - name: dremio-rest-server-operator diff --git a/charts/digitalhub/confs/dashboard/env.js b/charts/digitalhub/confs/dashboard/env.js index 42a334cf..c19b7455 100644 --- a/charts/digitalhub/confs/dashboard/env.js +++ b/charts/digitalhub/confs/dashboard/env.js @@ -1,5 +1,5 @@ {{ if .Values.dashboard.oidc.enabled -}} -window.env = {"VITE_OIDC_CONFIG":JSON.stringify({"accessTokenExpiringNotificationTime": "3570", "authority": "{{ .Values.dashboard.oidc.config.issuer }}", "clientId": "{{ .Values.dashboard.oidc.audience.clientId }}", "redirectUri": "http://{{ include "digitalhub.oidcDashboardEndpoint" . }}/oidc-callback", "responseType": "code", "scope": "openid profile email", "automaticSilentRenew": "false", "automaticSilentSignin": "false", "post_logout_redirect_uri": "http://{{ include "digitalhub.oidcDashboardEndpoint" . }}"}), "VITE_PLATFORM_TITLE": "OltreAI", "VITE_PLATFORM_VERSION": "0.7"} +window.env = {"VITE_OIDC_CONFIG":JSON.stringify({"accessTokenExpiringNotificationTime": "3570", "authority": "{{ .Values.dashboard.oidc.config.issuer }}", "clientId": "{{ .Values.dashboard.oidc.audience.clientId }}", "redirectUri": "http://{{ include "digitalhub.oidcDashboardEndpoint" . }}/oidc-callback", "responseType": "code", "scope": "openid profile email", "automaticSilentRenew": "false", "automaticSilentSignin": "false", "post_logout_redirect_uri": "http://{{ include "digitalhub.oidcDashboardEndpoint" . }}"}), "VITE_PLATFORM_TITLE": "OltreAI", "VITE_PLATFORM_VERSION": "0.8"} {{- else -}} -window.env = {"VITE_OIDC_CONFIG": null, "VITE_PLATFORM_TITLE": "OltreAI", "VITE_PLATFORM_VERSION": "0.7"} +window.env = {"VITE_OIDC_CONFIG": null, "VITE_PLATFORM_TITLE": "OltreAI", "VITE_PLATFORM_VERSION": "0.8"} {{- end }} diff --git a/charts/digitalhub/templates/dashboard/oidcconfig.yaml b/charts/digitalhub/templates/dashboard/oidcconfig.yaml index cd9c87b2..a1cccb24 100644 --- a/charts/digitalhub/templates/dashboard/oidcconfig.yaml +++ b/charts/digitalhub/templates/dashboard/oidcconfig.yaml @@ -21,7 +21,7 @@ spec: name: dashboard-oidc-secret stringData: env.js: |- - window.env = {"VITE_OIDC_CONFIG":JSON.stringify({"accessTokenExpiringNotificationTime": "3570", "authority": "{{ .Values.dashboard.oidc.config.issuer }}", "clientId": "{{ "{{" }} matrix.aacdashboardsecret.data.clientid | b64decode {{ "}}" }}", "redirectUri": "https://{{ include "digitalhub.oidcDashboardEndpoint" . }}/oidc-callback", "responseType": "code", "scope": "openid profile email", "automaticSilentRenew": "false", "automaticSilentSignin": "false", "post_logout_redirect_uri": "https://{{ include "digitalhub.oidcDashboardEndpoint" . }}"}), "VITE_PLATFORM_TITLE": "OltreAI", "VITE_PLATFORM_VERSION": "0.7"} + window.env = {"VITE_OIDC_CONFIG":JSON.stringify({"accessTokenExpiringNotificationTime": "3570", "authority": "{{ .Values.dashboard.oidc.config.issuer }}", "clientId": "{{ "{{" }} matrix.aacdashboardsecret.data.clientid | b64decode {{ "}}" }}", "redirectUri": "https://{{ include "digitalhub.oidcDashboardEndpoint" . }}/oidc-callback", "responseType": "code", "scope": "openid profile email", "automaticSilentRenew": "false", "automaticSilentSignin": "false", "post_logout_redirect_uri": "https://{{ include "digitalhub.oidcDashboardEndpoint" . }}"}), "VITE_PLATFORM_TITLE": "OltreAI", "VITE_PLATFORM_VERSION": "0.8"} {{- else -}} {{- $v := tpl (.Files.Get "confs/dashboard/env.js") . }} apiVersion: v1