From 8c05e86c78b01fb4e0dea228dd681d8e498a1a4c Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Thu, 18 Apr 2024 10:52:21 +0200 Subject: [PATCH] feat: exposes trusted issuers in charts config (#1237) --- charts/tractusx-connector-azure-vault/README.md | 1 + .../templates/deployment-controlplane.yaml | 5 +++++ charts/tractusx-connector-azure-vault/values.yaml | 2 ++ charts/tractusx-connector-memory/README.md | 1 + .../templates/deployment-runtime.yaml | 5 +++++ charts/tractusx-connector-memory/values.yaml | 2 ++ charts/tractusx-connector/README.md | 1 + .../templates/deployment-controlplane.yaml | 5 +++++ charts/tractusx-connector/values.yaml | 2 ++ 9 files changed, 24 insertions(+) diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index 4376e4a41..46c20e5a1 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -257,6 +257,7 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | iatp.sts.oauth.client.id | string | `nil` | | | iatp.sts.oauth.client.secret_alias | string | `nil` | | | iatp.sts.oauth.token_url | string | `nil` | | +| iatp.trustedIssuers | list | `[]` | Configures the trusted issuers for this runtime | | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | | install.postgresql | bool | `true` | | | nameOverride | string | `""` | | diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index c0b7c5697..d2db1d0da 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -280,6 +280,11 @@ spec: - name: "EDC_IAM_STS_DIM_URL" value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + {{- range $index, $issuer := .Values.iatp.trustedIssuers }} + - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID" + value: {{ $issuer | quote }} + {{- end }} + ################# ## BDRS CLIENT ## ################# diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index 06d109072..d5636be71 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -44,6 +44,8 @@ participant: iatp: # Decentralized IDentifier id: "did:web:changeme" + # -- Configures the trusted issuers for this runtime + trustedIssuers: [] sts: dim: url: diff --git a/charts/tractusx-connector-memory/README.md b/charts/tractusx-connector-memory/README.md index f6fb0d244..754a54cde 100644 --- a/charts/tractusx-connector-memory/README.md +++ b/charts/tractusx-connector-memory/README.md @@ -63,6 +63,7 @@ helm install my-release tractusx-edc/tractusx-connector-memory --version 0.7.0 \ | iatp.sts.oauth.client.id | string | `nil` | | | iatp.sts.oauth.client.secret_alias | string | `nil` | | | iatp.sts.oauth.token_url | string | `nil` | | +| iatp.trustedIssuers | list | `[]` | Configures the trusted issuers for this runtime | | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | | nameOverride | string | `""` | | | participant.id | string | `"BPNLCHANGEME"` | BPN Number | diff --git a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml index de0168256..a795f15ec 100644 --- a/charts/tractusx-connector-memory/templates/deployment-runtime.yaml +++ b/charts/tractusx-connector-memory/templates/deployment-runtime.yaml @@ -215,6 +215,11 @@ spec: - name: "EDC_IAM_STS_DIM_URL" value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + {{- range $index, $issuer := .Values.iatp.trustedIssuers }} + - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID" + value: { { $issuer | quote } } + {{- end }} + ################# ## BDRS CLIENT ## ################# diff --git a/charts/tractusx-connector-memory/values.yaml b/charts/tractusx-connector-memory/values.yaml index 7f3cbd2af..71a4bd2fb 100644 --- a/charts/tractusx-connector-memory/values.yaml +++ b/charts/tractusx-connector-memory/values.yaml @@ -37,6 +37,8 @@ participant: iatp: # Decentralized IDentifier id: "did:web:changeme" + # -- Configures the trusted issuers for this runtime + trustedIssuers: [] sts: dim: url: diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index 39737c163..1e7eb58d7 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -254,6 +254,7 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.7.0 \ | iatp.sts.oauth.client.id | string | `nil` | | | iatp.sts.oauth.client.secret_alias | string | `nil` | | | iatp.sts.oauth.token_url | string | `nil` | | +| iatp.trustedIssuers | list | `[]` | Configures the trusted issuers for this runtime | | imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) | | install.postgresql | bool | `true` | | | install.vault | bool | `true` | | diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml index 9ab02e54a..c00681995 100644 --- a/charts/tractusx-connector/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml @@ -281,6 +281,11 @@ spec: - name: "EDC_IAM_STS_DIM_URL" value: {{ .Values.iatp.sts.dim.url | required ".Values.iatp.sts.dim.url is required" | quote}} + {{- range $index, $issuer := .Values.iatp.trustedIssuers }} + - name: "EDC_IAM_TRUSTED-ISSUER_{{$index}}-ISSUER_ID" + value: {{ $issuer | quote }} + {{- end }} + ################# ## BDRS CLIENT ## ################# diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 160445e09..2d434d70c 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -44,6 +44,8 @@ participant: iatp: # Decentralized IDentifier id: "did:web:changeme" + # -- Configures the trusted issuers for this runtime + trustedIssuers: [] sts: dim: url: