From 6978619d4b8340ca49f72f1a8033d1042856051d Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Wed, 13 Dec 2023 12:28:04 +0100 Subject: [PATCH] feat(helm): allow for additional volume mounts in CP and DP --- .../templates/deployment-controlplane.yaml | 2 + .../templates/deployment-dataplane.yaml | 42 ++++++++++--------- .../values.yaml | 10 ++--- .../templates/deployment-controlplane.yaml | 2 + .../templates/deployment-dataplane.yaml | 42 ++++++++++--------- charts/tractusx-connector/values.yaml | 8 ++-- 6 files changed, 57 insertions(+), 49 deletions(-) diff --git a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml index 651e502a3..2d1018233 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-controlplane.yaml @@ -375,6 +375,7 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- toYaml .Values.controlplane.volumeMounts | default "" | nindent 12 }} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -389,6 +390,7 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- toYaml .Values.controlplane.volumes | default "" | nindent 8 }} - 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..ef62dba3e 100644 --- a/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector-azure-vault/templates/deployment-dataplane.yaml @@ -1,24 +1,24 @@ # -# Copyright (c) 2023 ZF Friedrichshafen AG -# Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH -# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# + # Copyright (c) 2023 ZF Friedrichshafen AG + # Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH + # Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + # Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation + # + # See the NOTICE file(s) distributed with this work for additional + # information regarding copyright ownership. + # + # This program and the accompanying materials are made available under the + # terms of the Apache License, Version 2.0 which is available at + # https://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + # License for the specific language governing permissions and limitations + # under the License. + # + # SPDX-License-Identifier: Apache-2.0 + # --- apiVersion: apps/v1 @@ -242,6 +242,7 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- toYaml .Values.dataplane.volumeMounts | default "" | nindent 12 }} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -256,6 +257,7 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- toYaml .Values.dataplane.volumes | default "" | nindent 8 }} - 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 1673727e6..d43f99d15 100644 --- a/charts/tractusx-connector-azure-vault/values.yaml +++ b/charts/tractusx-connector-azure-vault/values.yaml @@ -244,9 +244,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 @@ -444,9 +444,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 @@ -498,7 +498,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/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml index 22c54ba53..9f1f789c7 100644 --- a/charts/tractusx-connector/templates/deployment-controlplane.yaml +++ b/charts/tractusx-connector/templates/deployment-controlplane.yaml @@ -373,6 +373,7 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- toYaml .Values.controlplane.volumeMounts | default "" | nindent 12 }} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -387,6 +388,7 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- toYaml .Values.controlplane.volumes | default "" | nindent 8 }} - 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..7f483add1 100644 --- a/charts/tractusx-connector/templates/deployment-dataplane.yaml +++ b/charts/tractusx-connector/templates/deployment-dataplane.yaml @@ -1,24 +1,24 @@ # -# Copyright (c) 2023 ZF Friedrichshafen AG -# Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH -# Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# + # Copyright (c) 2023 ZF Friedrichshafen AG + # Copyright (c) 2023 Mercedes-Benz Tech Innovation GmbH + # Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) + # Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation + # + # See the NOTICE file(s) distributed with this work for additional + # information regarding copyright ownership. + # + # This program and the accompanying materials are made available under the + # terms of the Apache License, Version 2.0 which is available at + # https://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + # License for the specific language governing permissions and limitations + # under the License. + # + # SPDX-License-Identifier: Apache-2.0 + # --- apiVersion: apps/v1 @@ -241,6 +241,7 @@ spec: {{- end }} {{- end }} volumeMounts: + {{- toYaml .Values.dataplane.volumeMounts | default "" | nindent 12 }} - name: "configuration" mountPath: "/app/opentelemetry.properties" subPath: "opentelemetry.properties" @@ -255,6 +256,7 @@ spec: - name: "tmp" mountPath: "/tmp" volumes: + {{- toYaml .Values.dataplane.volumes | default "" | nindent 8 }} - name: "configuration" configMap: name: {{ include "txdc.fullname" . }}-dataplane diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml index 76b50711c..5502a9f5b 100644 --- a/charts/tractusx-connector/values.yaml +++ b/charts/tractusx-connector/values.yaml @@ -244,9 +244,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 @@ -442,9 +442,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