From e7d7f13ba84bec0fe036333b8ef10606fedb2ece Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Wed, 13 Dec 2023 12:38:56 +0100 Subject: [PATCH] feat(helm): allow for additional volume mounts --- DEPENDENCIES | 2 +- charts/tractusx-connector-azure-vault/README.md | 11 +++++------ .../templates/deployment-controlplane.yaml | 6 ++++++ .../templates/deployment-dataplane.yaml | 6 ++++++ charts/tractusx-connector-azure-vault/values.yaml | 10 +++++----- charts/tractusx-connector/README.md | 8 ++++---- .../templates/deployment-controlplane.yaml | 6 ++++++ .../templates/deployment-dataplane.yaml | 6 ++++++ charts/tractusx-connector/values.yaml | 8 ++++---- 9 files changed, 43 insertions(+), 20 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 665363136..a5e36c1e2 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -10,7 +10,7 @@ maven/mavencentral/com.azure/azure-core/1.43.0, MIT AND Apache-2.0, approved, #1 maven/mavencentral/com.azure/azure-core/1.44.1, MIT, approved, clearlydefined maven/mavencentral/com.azure/azure-core/1.45.1, MIT AND Apache-2.0, approved, #11845 maven/mavencentral/com.azure/azure-identity/1.10.1, MIT AND Apache-2.0, approved, #10086 -maven/mavencentral/com.azure/azure-identity/1.11.1, , restricted, clearlydefined +maven/mavencentral/com.azure/azure-identity/1.11.1, MIT, approved, clearlydefined maven/mavencentral/com.azure/azure-json/1.1.0, MIT AND Apache-2.0, approved, #10547 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.7.0, MIT, approved, #10868 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.7.3, MIT, approved, #10868 diff --git a/charts/tractusx-connector-azure-vault/README.md b/charts/tractusx-connector-azure-vault/README.md index edcfb178d..5188b7fd6 100644 --- a/charts/tractusx-connector-azure-vault/README.md +++ b/charts/tractusx-connector-azure-vault/README.md @@ -167,8 +167,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | controlplane.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained | | controlplane.tolerations | list | `[]` | | | controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) | -| controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | -| controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | +| controlplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | +| controlplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | customCaCerts | object | `{}` | Add custom ca certificates to the truststore | | customLabels | object | `{}` | To add some custom labels | | dataplane.affinity | object | `{}` | | @@ -250,8 +250,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. | | dataplane.tolerations | list | `[]` | | | dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) | -| dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | -| dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | +| dataplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | +| dataplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | fullnameOverride | string | `""` | | | 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` | | @@ -260,9 +260,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0. | postgresql.auth.database | string | `"edc"` | | | postgresql.auth.password | string | `"password"` | | | postgresql.auth.username | string | `"user"` | | -| postgresql.enabled | bool | `false` | | | postgresql.jdbcUrl | string | `"jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"` | | -| postgresql.primary.persistence | string | `nil` | | +| postgresql.primary.persistence.enabled | bool | `false` | | | postgresql.readReplicas.persistence.enabled | bool | `false` | | | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `true` | | diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index 7e15f844a..48c58f65a 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -377,6 +377,9 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- if .Values.controlplane.volumeMounts }} + {{- toYaml .Values.controlplane.volumeMounts | nindent 12 }} + {{- end}} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -391,6 +394,9 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- if .Values.controlplane.volumeMounts }} + {{- toYaml .Values.controlplane.volumes | nindent 8 }} + {{- end}} - name: "configuration" configMap: name: {{ include "txdc.fullname" . }}-controlplane diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml index 3d1243817..604b7e8a3 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml @@ -242,6 +242,9 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- if .Values.dataplane.volumeMounts }} + {{- toYaml .Values.dataplane.volumeMounts | nindent 12 }} + {{- end}} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -256,6 +259,9 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- if .Values.dataplane.volumes }} + {{- toYaml .Values.dataplane.volumes | nindent 8 }} + {{- end}} - name: "configuration" configMap: name: {{ include "txdc.fullname" . }}-dataplane diff --git a/charts/tractusx-connector-azure-vault/values.yaml b/charts/tractusx-connector-azure-vault/values.yaml index fe531cef9..81e9784b8 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -245,9 +245,9 @@ controlplane: # -- If preset enables certificate generation via cert-manager cluster-wide issuer clusterIssuer: "" # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container - volumeMounts: [] + volumeMounts: # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories - volumes: [] + volumes: # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -445,9 +445,9 @@ dataplane: # -- If preset enables certificate generation via cert-manager cluster-wide issuer clusterIssuer: "" # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container - volumeMounts: [] + volumeMounts: # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories - volumes: [] + volumes: # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -499,7 +499,7 @@ postgresql: jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc" primary: persistence: - enabled: false + enabled: false readReplicas: persistence: enabled: false diff --git a/charts/tractusx-connector/README.md b/charts/tractusx-connector/README.md index 16eac5cf5..ec42b585d 100644 --- a/charts/tractusx-connector/README.md +++ b/charts/tractusx-connector/README.md @@ -161,8 +161,8 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0-rc2 \ | controlplane.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained | | controlplane.tolerations | list | `[]` | | | controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) | -| controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | -| controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | +| controlplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | +| controlplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | customCaCerts | object | `{}` | Add custom ca certificates to the truststore | | customLabels | object | `{}` | To add some custom labels | | dataplane.affinity | object | `{}` | | @@ -244,8 +244,8 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0-rc2 \ | dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. | | dataplane.tolerations | list | `[]` | | | dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) | -| dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | -| dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | +| dataplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container | +| dataplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories | | fullnameOverride | string | `""` | | | 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` | | diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml index 99a559208..d94abb9a4 100644 --- a/charts/tractusx-connector/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml @@ -376,6 +376,9 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- if .Values.controlplane.volumeMounts }} + {{- toYaml .Values.controlplane.volumeMounts | nindent 12 }} + {{- end}} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -390,6 +393,9 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- if .Values.controlplane.volumeMounts }} + {{- toYaml .Values.controlplane.volumes | nindent 8 }} + {{- end}} - name: "configuration" configMap: name: {{ include "txdc.fullname" . }}-controlplane diff --git a/charts/tractusx-connector/templates/deployment-dataplane.yaml b/charts/tractusx-connector/templates/deployment-dataplane.yaml index 0501562ea..2abd8ced4 100644 --- a/charts/tractusx-connector/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml @@ -241,6 +241,9 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- if .Values.dataplane.volumeMounts }} + {{- toYaml .Values.dataplane.volumeMounts | nindent 12 }} + {{- end}} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -255,6 +258,9 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- if .Values.dataplane.volumeMounts }} + {{- toYaml .Values.dataplane.volumes | nindent 8 }} + {{- end}} - name: "configuration" configMap: name: {{ include "txdc.fullname" . }}-dataplane diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 31ce6872c..82acff63c 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -245,9 +245,9 @@ controlplane: # -- If preset enables certificate generation via cert-manager cluster-wide issuer clusterIssuer: "" # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container - volumeMounts: [] + volumeMounts: # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories - volumes: [] + volumes: # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -443,9 +443,9 @@ dataplane: # -- If preset enables certificate generation via cert-manager cluster-wide issuer clusterIssuer: "" # -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container - volumeMounts: [] + volumeMounts: # -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories - volumes: [] + volumes: # -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container resources: {} # We usually recommend not to specify default resources and to leave this as a conscious