From ffad5075497832a2e0b6e4d7dc191300757a146f Mon Sep 17 00:00:00 2001 From: pvannierop Date: Mon, 21 Oct 2024 14:26:47 +0200 Subject: [PATCH] Complete implementation for derived IDP urls --- charts/management-portal/Chart.yaml | 2 +- charts/management-portal/README.md | 2 +- charts/management-portal/templates/deployment.yaml | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/management-portal/Chart.yaml b/charts/management-portal/Chart.yaml index ffe155c..4b73cca 100644 --- a/charts/management-portal/Chart.yaml +++ b/charts/management-portal/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.1.5" description: A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. name: management-portal -version: 1.2.5 +version: 1.2.6 icon: "http://radar-base.org/wp-content/uploads/2022/09/Logo_RADAR-Base-RGB.png" sources: - https://github.com/RADAR-base/radar-helm-charts/tree/main/charts/management-portal diff --git a/charts/management-portal/README.md b/charts/management-portal/README.md index 5c9eecf..dce81ce 100644 --- a/charts/management-portal/README.md +++ b/charts/management-portal/README.md @@ -3,7 +3,7 @@ # management-portal [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/management-portal)](https://artifacthub.io/packages/helm/radar-base/management-portal) -![Version: 1.2.5](https://img.shields.io/badge/Version-1.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.5](https://img.shields.io/badge/AppVersion-2.1.5-informational?style=flat-square) +![Version: 1.2.6](https://img.shields.io/badge/Version-1.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.5](https://img.shields.io/badge/AppVersion-2.1.5-informational?style=flat-square) A Helm chart for RADAR-Base Management Portal to manage projects and participants throughout RADAR-base. diff --git a/charts/management-portal/templates/deployment.yaml b/charts/management-portal/templates/deployment.yaml index 58e582d..95f10d5 100644 --- a/charts/management-portal/templates/deployment.yaml +++ b/charts/management-portal/templates/deployment.yaml @@ -1,4 +1,6 @@ {{ $https := ternary "http" "https" (or .Values.disable_tls (not .Values.ingress.tls)) }} +{{ $idpLoginUrl := .Values.identity_server.login_url | default (printf "%s://%s/kratos-ui" $https .Values.server_name) }} +{{ $idpServerUrl := .Values.identity_server.server_url | default (printf "%s://%s/kratos" $https .Values.server_name) }} apiVersion: apps/v1 kind: Deployment metadata: @@ -90,15 +92,15 @@ spec: - name: MANAGEMENTPORTAL_IDENTITY_SERVER_ADMIN_EMAIL value: {{ .Values.identity_server.admin_email }} - name: MANAGEMENTPORTAL_IDENTITY_SERVER_SERVER_URL - value: {{ default (printf "%s://%s/kratos" $https .Values.server_name) .Values.identity_server.server_url }} + value: {{ $idpServerUrl }} - name: MANAGEMENTPORTAL_IDENTITY_SERVER_LOGIN_URL - value: {{ default (printf "%s://%s/kratos-ui" $https .Values.server_name) .Values.identity_server.login_url }} + value: {{ $idpLoginUrl }} - name: MANAGEMENTPORTAL_IDENTITY_SERVER_SERVER_ADMIN_URL value: {{ .Values.identity_server.server_admin_url }} - name: MANAGEMENTPORTAL_AUTHSERVER_SERVERURL - value: {{ .Values.authserver.server_url | quote }} + value: {{ $idpServerUrl }} - name: MANAGEMENTPORTAL_AUTHSERVER_LOGINURL - value: {{ .Values.authserver.login_url | quote }} + value: {{ $idpLoginUrl }} - name: MANAGEMENTPORTAL_AUTHSERVER_SERVERADMINURL value: {{ .Values.authserver.server_admin_url | quote }} - name: MANAGEMENTPORTAL_COMMON_ADMIN_PASSWORD