From 0496320936c53165304137676666591b7815a900 Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger <43503240+paullatzelsperger@users.noreply.github.com> Date: Tue, 23 Jul 2024 10:31:05 +0200 Subject: [PATCH] fix(charts): make DIM URL optional (#1444) * fix(charts): make DIM URL optional * pr remarks * DEPENDENCIES --- .../templates/deployment-controlplane.yaml | 4 +++- .../templates/deployment-dataplane.yaml | 5 ++++- .../templates/deployment-runtime.yaml | 5 ++++- .../templates/deployment-controlplane.yaml | 4 +++- .../tractusx-connector/templates/deployment-dataplane.yaml | 4 +++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index 094de3dd3..fb0b2a052 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -292,8 +292,10 @@ spec: value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}} - name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS" value: {{ .Values.iatp.sts.oauth.client.secret_alias | required ".Values.iatp.sts.oauth.client.secret_alias is required" | quote}} + {{- if .Values.iatp.sts.dim.url }} - name: "TX_EDC_IAM_STS_DIM_URL" - value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + value: {{ .Values.iatp.sts.dim.url | quote}} + {{- end}} {{- range $index, $issuer := .Values.iatp.trustedIssuers }} - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID" diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml index 298d66c0e..c3e80a029 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml @@ -219,8 +219,11 @@ spec: value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}} - name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS" value: {{ .Values.iatp.sts.oauth.client.secret_alias | required ".Values.iatp.sts.oauth.client.secret_alias is required" | quote}} + + {{- if .Values.iatp.sts.dim.url }} - name: "TX_EDC_IAM_STS_DIM_URL" - value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + value: {{ .Values.iatp.sts.dim.url | quote}} + {{- end}} ################ ## POSTGRESQL ## diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml index 806c3c503..64dc0cd9f 100644 --- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml +++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml @@ -212,8 +212,11 @@ spec: value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}} - name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS" value: {{ .Values.iatp.sts.oauth.client.secret_alias | required ".Values.iatp.sts.oauth.client.secret_alias is required" | quote}} + + {{- if .Values.iatp.sts.dim.url }} - name: "TX_EDC_IAM_STS_DIM_URL" - value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + value: {{ .Values.iatp.sts.dim.url | quote}} + {{- end}} {{- range $index, $issuer := .Values.iatp.trustedIssuers }} - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID" diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml index 7f714d273..e904da367 100644 --- a/charts/tractusx-connector/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml @@ -292,8 +292,10 @@ spec: value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}} - name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS" value: {{ .Values.iatp.sts.oauth.client.secret_alias | required ".Values.iatp.sts.oauth.client.secret_alias is required" | quote}} + {{- if .Values.iatp.sts.dim.url }} - name: "TX_EDC_IAM_STS_DIM_URL" - value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + value: {{ .Values.iatp.sts.dim.url | quote}} + {{- end }} {{- range $index, $issuer := .Values.iatp.trustedIssuers }} - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID" diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml index d84c9fc83..afd3deb13 100644 --- a/charts/tractusx-connector/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml @@ -215,8 +215,10 @@ spec: value: {{ .Values.iatp.sts.oauth.client.id | required ".Values.iatp.sts.oauth.client.id is required" | quote}} - name: "EDC_IAM_STS_OAUTH_CLIENT_SECRET_ALIAS" value: {{ .Values.iatp.sts.oauth.client.secret_alias | required ".Values.iatp.sts.oauth.client.secret_alias is required" | quote}} + {{- if .Values.iatp.sts.dim.url }} - name: "TX_EDC_IAM_STS_DIM_URL" - value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + value: {{ .Values.iatp.sts.dim.url | quote}} + {{- end }} ################ ## POSTGRESQL ##