From c54205555d008fae5c7a5cbfe9447313d7e10960 Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 19 Jan 2023 10:59:36 +0100 Subject: [PATCH 1/3] cplp-1874: add env specfic config in registration app container --- .../portal/templates/deployment-frontend-registration.yaml | 7 +++++++ charts/portal/values-dev.yaml | 4 ++++ charts/portal/values.yaml | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/charts/portal/templates/deployment-frontend-registration.yaml b/charts/portal/templates/deployment-frontend-registration.yaml index 742c4e93a..cf36de56c 100644 --- a/charts/portal/templates/deployment-frontend-registration.yaml +++ b/charts/portal/templates/deployment-frontend-registration.yaml @@ -37,5 +37,12 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: {{ .Values.frontend.registration.image.name }}:{{ .Values.frontend.registration.image.registrationtag | default .Chart.AppVersion }} imagePullPolicy: "Always" + env: + - name: PORTAL_FRONTEND_URL + value: "{{ .Values.frontend.registration.env.PORTAL_FRONTEND_URL }}" + - name: PORTAL_BACKEND_URL + value: "{{ .Values.frontend.registration.env.PORTAL_BACKEND_URL }}" + - name: CENTRALIDP_URL + value: "{{ .Values.frontend.registration.env.CENTRALIDP_URL }}" ports: - containerPort: {{ .Values.portContainer }} diff --git a/charts/portal/values-dev.yaml b/charts/portal/values-dev.yaml index 97c8e849f..674003a19 100644 --- a/charts/portal/values-dev.yaml +++ b/charts/portal/values-dev.yaml @@ -61,6 +61,10 @@ frontend: registration: image: registrationtag: main_d51a09ce7b8002abd2844dc82871916062c0b86f + env: + PORTAL_FRONTEND_URL: "https://portal.dev.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.dev.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.dev.demo.catena-x.net/auth" backend: ingress: diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index fcadc19a3..4b45bd48b 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -40,6 +40,10 @@ frontend: image: name: "ghcr.io/catenax-ng/tx-portal-frontend-registration" registrationtag: 1.0.0-RC1 + env: + PORTAL_FRONTEND_URL: "https://portal.dummy" + PORTAL_BACKEND_URL: "https://portal-backend.dummy" + CENTRALIDP_URL: "https://centralidp.dummy/auth" assets: name: "assets" image: From c2b95ff4bd898bb3387c91613957f1907b3a712c Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 19 Jan 2023 11:37:57 +0100 Subject: [PATCH 2/3] cplp-1874: add env specfic config in registration app container --- charts/portal/values-beta.yaml | 4 ++++ charts/portal/values-int.yaml | 4 ++++ charts/portal/values-pen.yaml | 4 ++++ charts/portal/values-preprod.yaml | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/charts/portal/values-beta.yaml b/charts/portal/values-beta.yaml index 2886dc4fe..8f301d790 100644 --- a/charts/portal/values-beta.yaml +++ b/charts/portal/values-beta.yaml @@ -61,6 +61,10 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 + env: + PORTAL_FRONTEND_URL: "https://portal.beta.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.beta.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.beta.demo.catena-x.net/auth" backend: ingress: diff --git a/charts/portal/values-int.yaml b/charts/portal/values-int.yaml index 380e5252c..422db28e0 100644 --- a/charts/portal/values-int.yaml +++ b/charts/portal/values-int.yaml @@ -61,6 +61,10 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 + env: + PORTAL_FRONTEND_URL: "https://portal.int.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.int.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.int.demo.catena-x.net/auth" backend: ingress: diff --git a/charts/portal/values-pen.yaml b/charts/portal/values-pen.yaml index 2071846ae..648ad15e8 100644 --- a/charts/portal/values-pen.yaml +++ b/charts/portal/values-pen.yaml @@ -61,6 +61,10 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 + env: + PORTAL_FRONTEND_URL: "https://portal-pen.dev.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend-pen.dev.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp-pen.dev.demo.catena-x.net/auth" backend: ingress: diff --git a/charts/portal/values-preprod.yaml b/charts/portal/values-preprod.yaml index f91d6a191..52ca12338 100644 --- a/charts/portal/values-preprod.yaml +++ b/charts/portal/values-preprod.yaml @@ -61,6 +61,10 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 + env: + PORTAL_FRONTEND_URL: "https://portal.pre-prod.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.pre-prod.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.pre-prod.demo.catena-x.net/auth" backend: ingress: From 3319d0195896c4ebc80f05d580dd5b95ecc1af7c Mon Sep 17 00:00:00 2001 From: Evelyn Gurschler Date: Thu, 19 Jan 2023 14:20:13 +0100 Subject: [PATCH 3/3] cplp-1874: add env specfic config in frontend containers --- .../portal/templates/deployment-frontend-portal.yaml | 11 +++++++++++ .../templates/deployment-frontend-registration.yaml | 6 +++--- charts/portal/values-beta.yaml | 11 +++++++---- charts/portal/values-dev.yaml | 11 +++++++---- charts/portal/values-int.yaml | 11 +++++++---- charts/portal/values-pen.yaml | 11 +++++++---- charts/portal/values-preprod.yaml | 11 +++++++---- charts/portal/values.yaml | 10 ++++++---- 8 files changed, 55 insertions(+), 27 deletions(-) diff --git a/charts/portal/templates/deployment-frontend-portal.yaml b/charts/portal/templates/deployment-frontend-portal.yaml index 2d6376497..b6fcc1989 100644 --- a/charts/portal/templates/deployment-frontend-portal.yaml +++ b/charts/portal/templates/deployment-frontend-portal.yaml @@ -37,5 +37,16 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: {{ .Values.frontend.portal.image.name }}:{{ .Values.frontend.portal.image.portaltag | default .Chart.AppVersion }} imagePullPolicy: "Always" + env: + - name: PORTAL_FRONTEND_URL + value: "{{ .Values.frontend.env.PORTAL_FRONTEND_URL }}" + - name: PORTAL_BACKEND_URL + value: "{{ .Values.frontend.env.PORTAL_BACKEND_URL }}" + - name: CENTRALIDP_URL + value: "{{ .Values.frontend.env.CENTRALIDP_URL }}" + - name: BPDM_API_URL + value: "{{ .Values.frontend.env.BPDM_API_URL }}" + - name: SEMANTICS_URL + value: "{{ .Values.frontend.env.SEMANTICS_URL }}" ports: - containerPort: {{ .Values.portContainer }} diff --git a/charts/portal/templates/deployment-frontend-registration.yaml b/charts/portal/templates/deployment-frontend-registration.yaml index cf36de56c..32e908eb7 100644 --- a/charts/portal/templates/deployment-frontend-registration.yaml +++ b/charts/portal/templates/deployment-frontend-registration.yaml @@ -39,10 +39,10 @@ spec: imagePullPolicy: "Always" env: - name: PORTAL_FRONTEND_URL - value: "{{ .Values.frontend.registration.env.PORTAL_FRONTEND_URL }}" + value: "{{ .Values.frontend.env.PORTAL_FRONTEND_URL }}" - name: PORTAL_BACKEND_URL - value: "{{ .Values.frontend.registration.env.PORTAL_BACKEND_URL }}" + value: "{{ .Values.frontend.env.PORTAL_BACKEND_URL }}" - name: CENTRALIDP_URL - value: "{{ .Values.frontend.registration.env.CENTRALIDP_URL }}" + value: "{{ .Values.frontend.env.CENTRALIDP_URL }}" ports: - containerPort: {{ .Values.portContainer }} diff --git a/charts/portal/values-beta.yaml b/charts/portal/values-beta.yaml index 8f301d790..409c53007 100644 --- a/charts/portal/values-beta.yaml +++ b/charts/portal/values-beta.yaml @@ -61,10 +61,13 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 - env: - PORTAL_FRONTEND_URL: "https://portal.beta.demo.catena-x.net" - PORTAL_BACKEND_URL: "https://portal-backend.beta.demo.catena-x.net" - CENTRALIDP_URL: "https://centralidp.beta.demo.catena-x.net/auth" + + env: + PORTAL_FRONTEND_URL: "https://portal.beta.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.beta.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.beta.demo.catena-x.net/auth" + BPDM_API_URL: "https://partners-pool.beta.demo.catena-x.net/api" + SEMANTICS_URL: "https://semantics.beta.demo.catena-x.net" backend: ingress: diff --git a/charts/portal/values-dev.yaml b/charts/portal/values-dev.yaml index 674003a19..1b0c7b13f 100644 --- a/charts/portal/values-dev.yaml +++ b/charts/portal/values-dev.yaml @@ -61,10 +61,13 @@ frontend: registration: image: registrationtag: main_d51a09ce7b8002abd2844dc82871916062c0b86f - env: - PORTAL_FRONTEND_URL: "https://portal.dev.demo.catena-x.net" - PORTAL_BACKEND_URL: "https://portal-backend.dev.demo.catena-x.net" - CENTRALIDP_URL: "https://centralidp.dev.demo.catena-x.net/auth" + + env: + PORTAL_FRONTEND_URL: "https://portal.dev.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.dev.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.dev.demo.catena-x.net/auth" + BPDM_API_URL: "https://partners-pool.dev.demo.catena-x.net/api" + SEMANTICS_URL: "https://semantics.dev.demo.catena-x.net" backend: ingress: diff --git a/charts/portal/values-int.yaml b/charts/portal/values-int.yaml index 422db28e0..8723408f9 100644 --- a/charts/portal/values-int.yaml +++ b/charts/portal/values-int.yaml @@ -61,10 +61,13 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 - env: - PORTAL_FRONTEND_URL: "https://portal.int.demo.catena-x.net" - PORTAL_BACKEND_URL: "https://portal-backend.int.demo.catena-x.net" - CENTRALIDP_URL: "https://centralidp.int.demo.catena-x.net/auth" + + env: + PORTAL_FRONTEND_URL: "https://portal.int.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.int.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.int.demo.catena-x.net/auth" + BPDM_API_URL: "https://partners-pool.int.demo.catena-x.net/api" + SEMANTICS_URL: "https://semantics.int.demo.catena-x.net" backend: ingress: diff --git a/charts/portal/values-pen.yaml b/charts/portal/values-pen.yaml index 648ad15e8..ba68f7693 100644 --- a/charts/portal/values-pen.yaml +++ b/charts/portal/values-pen.yaml @@ -61,10 +61,13 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 - env: - PORTAL_FRONTEND_URL: "https://portal-pen.dev.demo.catena-x.net" - PORTAL_BACKEND_URL: "https://portal-backend-pen.dev.demo.catena-x.net" - CENTRALIDP_URL: "https://centralidp-pen.dev.demo.catena-x.net/auth" + + env: + PORTAL_FRONTEND_URL: "https://portal-pen.dev.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend-pen.dev.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp-pen.dev.demo.catena-x.net/auth" + BPDM_API_URL: "https://partners-pool-pen.dev.demo.catena-x.net/api" + SEMANTICS_URL: "https://semantics-pen.dev.demo.catena-x.net" backend: ingress: diff --git a/charts/portal/values-preprod.yaml b/charts/portal/values-preprod.yaml index 52ca12338..354c0f415 100644 --- a/charts/portal/values-preprod.yaml +++ b/charts/portal/values-preprod.yaml @@ -61,10 +61,13 @@ frontend: registration: image: registrationtag: 1.0.0-RC1 - env: - PORTAL_FRONTEND_URL: "https://portal.pre-prod.demo.catena-x.net" - PORTAL_BACKEND_URL: "https://portal-backend.pre-prod.demo.catena-x.net" - CENTRALIDP_URL: "https://centralidp.pre-prod.demo.catena-x.net/auth" + + env: + PORTAL_FRONTEND_URL: "https://portal.pre-prod.demo.catena-x.net" + PORTAL_BACKEND_URL: "https://portal-backend.pre-prod.demo.catena-x.net" + CENTRALIDP_URL: "https://centralidp.pre-prod.demo.catena-x.net/auth" + BPDM_API_URL: "https://partners-pool.pre-prod.demo.catena-x.net/api" + SEMANTICS_URL: "https://semantics.pre-prod.demo.catena-x.net" backend: ingress: diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 4b45bd48b..ff9d86c7e 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -40,15 +40,17 @@ frontend: image: name: "ghcr.io/catenax-ng/tx-portal-frontend-registration" registrationtag: 1.0.0-RC1 - env: - PORTAL_FRONTEND_URL: "https://portal.dummy" - PORTAL_BACKEND_URL: "https://portal-backend.dummy" - CENTRALIDP_URL: "https://centralidp.dummy/auth" assets: name: "assets" image: name: "ghcr.io/catenax-ng/tx-portal-assets" assetstag: 1.0.0-RC1 + env: + PORTAL_FRONTEND_URL: "https://portal.dummy" + PORTAL_BACKEND_URL: "https://portal-backend.dummy" + CENTRALIDP_URL: "https://centralidp.dummy/auth" + BPDM_API_URL: "https://partners-pool.dummy" + SEMANTICS_URL: "https://semantics.dummy" backend: ingress: