diff --git a/charts/bpdm/CHANGELOG.md b/charts/bpdm/CHANGELOG.md index a583d0a47..0b480d395 100644 --- a/charts/bpdm/CHANGELOG.md +++ b/charts/bpdm/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/), ## [5.0.0] - tbd +### Changed + +- update BPDM Pool Chart to version 7.0.0 +- update BPDM Gate Chart to version 6.0.0 +- update BPDM Orchestrator Chart to version 3.0.0 +- update BPDM Cleaning Service Dummy Chart to version 3.0.0 +- update BPDM Bridge Chart to version 3.0.0 + ### Removed - BPDM Bridge Helm Chart diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml index 58b7ea6fb..28b4f3c77 100644 --- a/charts/bpdm/Chart.yaml +++ b/charts/bpdm/Chart.yaml @@ -22,8 +22,8 @@ apiVersion: v2 name: bpdm type: application description: A Helm chart for Kubernetes that deploys the BPDM applications -version: 5.0.0-alpha.0 -appVersion: "5.0.1" +version: 5.0.0-alpha.1 +appVersion: "6.0.0-alpha.0" home: https://github.com/eclipse-tractusx/bpdm sources: - https://github.com/eclipse-tractusx/bpdm @@ -33,23 +33,23 @@ maintainers: dependencies: - name: bpdm-gate - version: 5.0.4 + version: 6.0.0-alpha.0 alias: bpdm-gate condition: bpdm-gate.enabled - name: bpdm-pool - version: 6.0.4 + version: 7.0.0-alpha.0 alias: bpdm-pool condition: bpdm-pool.enabled - name: bpdm-cleaning-service-dummy - version: 2.0.4 + version: 3.0.0-alpha.0 alias: bpdm-cleaning-service-dummy condition: bpdm-cleaning-service-dummy.enabled - name: bpdm-orchestrator - version: 2.0.4 + version: 3.0.0-alpha.0 alias: bpdm-orchestrator condition: bpdm-orchestrator.enabled - name: bpdm-common - version: 1.0.0 + version: 1.0.1 - name: postgresql version: 11.9.13 repository: https://charts.bitnami.com/bitnami diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md b/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md index 374577dae..8e1df014e 100644 --- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md +++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/), +## [3.0.0] - tbd + +### Changed + +- update app version to 6.0.0 ## [2.0.4] - 2024-03-29 diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml index d0df5927f..a203c9cf0 100644 --- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml +++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml @@ -21,15 +21,15 @@ apiVersion: v2 type: application name: bpdm-cleaning-service-dummy -appVersion: "5.0.1" -version: 2.0.4 +appVersion: "6.0.0-alpha.0" +version: 3.0.0-alpha.0 description: A Helm chart for deploying the BPDM cleaning service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: - https://github.com/eclipse-tractusx/bpdm dependencies: - name: bpdm-common - version: 1.0.0 + version: 1.0.1 repository: "file://../bpdm-common" maintainers: - name: Nico Koprowski diff --git a/charts/bpdm/charts/bpdm-common/Chart.yaml b/charts/bpdm/charts/bpdm-common/Chart.yaml index 3bf4fbd83..06e53aa36 100644 --- a/charts/bpdm/charts/bpdm-common/Chart.yaml +++ b/charts/bpdm/charts/bpdm-common/Chart.yaml @@ -21,7 +21,7 @@ apiVersion: v2 type: library name: bpdm-common -version: 1.0.0 +version: 1.0.1 description: A library Helm Chart for other BPDM Charts home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: diff --git a/charts/bpdm/charts/bpdm-common/templates/_configMap.yaml b/charts/bpdm/charts/bpdm-common/templates/_configMap.tpl similarity index 91% rename from charts/bpdm/charts/bpdm-common/templates/_configMap.yaml rename to charts/bpdm/charts/bpdm-common/templates/_configMap.tpl index 1acb4a776..3d737747f 100644 --- a/charts/bpdm/charts/bpdm-common/templates/_configMap.yaml +++ b/charts/bpdm/charts/bpdm-common/templates/_configMap.tpl @@ -37,7 +37,7 @@ data: {{- $ := .context -}} {{- $defaultTemplate := .defaultValues | default "bpdm-common.empty" -}} {{- $defaultValues := fromYaml (include $defaultTemplate $) | default (dict ) -}} -{{- $override := $.Values.applicationConfig | default (dict ) -}} -{{- $finalValues := merge $defaultValues $override -}} +{{- $override := .context.Values.applicationConfig | default (dict ) -}} +{{- $finalValues := mergeOverwrite $defaultValues $override -}} {{- include "bpdm-common.configMap.tpl" (dict "context" $ "override" $finalValues) -}} {{- end -}} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-common/templates/_deployment.yaml b/charts/bpdm/charts/bpdm-common/templates/_deployment.tpl similarity index 100% rename from charts/bpdm/charts/bpdm-common/templates/_deployment.yaml rename to charts/bpdm/charts/bpdm-common/templates/_deployment.tpl diff --git a/charts/bpdm/charts/bpdm-common/templates/_helpers.tpl b/charts/bpdm/charts/bpdm-common/templates/_helpers.tpl index 1d4016e12..7d5381696 100644 --- a/charts/bpdm/charts/bpdm-common/templates/_helpers.tpl +++ b/charts/bpdm/charts/bpdm-common/templates/_helpers.tpl @@ -31,12 +31,11 @@ If release name contains chart name it will be used as a full name. */}} {{- define "bpdm.fullname" -}} {{- if .Values.fullnameOverride }} -{{- $name := .Values.fullnameOverride }} + {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else if .Values.nameOverride }} -{{- $name := .Values.nameOverride }} + {{- include "bpdm.toReleaseName" (list . .Values.nameOverride) -}} {{- else }} -{{- $name := .Chart.Name }} -{{- include "bpdm.toReleaseName" (list . $name) -}} + {{- include "bpdm.toReleaseName" (list . .Chart.Name) -}} {{- end }} {{- end }} diff --git a/charts/bpdm/charts/bpdm-common/templates/_ingress.yaml b/charts/bpdm/charts/bpdm-common/templates/_ingress.tpl similarity index 100% rename from charts/bpdm/charts/bpdm-common/templates/_ingress.yaml rename to charts/bpdm/charts/bpdm-common/templates/_ingress.tpl diff --git a/charts/bpdm/charts/bpdm-common/templates/_secret.yaml b/charts/bpdm/charts/bpdm-common/templates/_secret.tpl similarity index 100% rename from charts/bpdm/charts/bpdm-common/templates/_secret.yaml rename to charts/bpdm/charts/bpdm-common/templates/_secret.tpl diff --git a/charts/bpdm/charts/bpdm-common/templates/_service.yaml b/charts/bpdm/charts/bpdm-common/templates/_service.tpl similarity index 100% rename from charts/bpdm/charts/bpdm-common/templates/_service.yaml rename to charts/bpdm/charts/bpdm-common/templates/_service.tpl diff --git a/charts/bpdm/charts/bpdm-gate/CHANGELOG.md b/charts/bpdm/charts/bpdm-gate/CHANGELOG.md index f5a07de91..3b73f2dd0 100644 --- a/charts/bpdm/charts/bpdm-gate/CHANGELOG.md +++ b/charts/bpdm/charts/bpdm-gate/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/), +## [6.0.0] - tbd + +### Changed + +- update app version to 6.0.0 + ## [5.0.4] - 2024-03-29 ### Added diff --git a/charts/bpdm/charts/bpdm-gate/Chart.yaml b/charts/bpdm/charts/bpdm-gate/Chart.yaml index 6994ee8b2..6267145d8 100644 --- a/charts/bpdm/charts/bpdm-gate/Chart.yaml +++ b/charts/bpdm/charts/bpdm-gate/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 type: application name: bpdm-gate -appVersion: "5.0.1" -version: 5.0.4 +appVersion: "6.0.0-alpha.0" +version: 6.0.0-alpha.0 description: A Helm chart for deploying the BPDM gate service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: @@ -34,7 +34,7 @@ dependencies: alias: postgres condition: postgres.enabled - name: bpdm-common - version: 1.0.0 + version: 1.0.1 repository: "file://../bpdm-common" maintainers: - name: Nico Koprowski diff --git a/charts/bpdm/charts/bpdm-gate/templates/ingress.yaml b/charts/bpdm/charts/bpdm-gate/templates/ingress.yaml index 20f4b2a31..09efb62e8 100644 --- a/charts/bpdm/charts/bpdm-gate/templates/ingress.yaml +++ b/charts/bpdm/charts/bpdm-gate/templates/ingress.yaml @@ -1,6 +1,6 @@ --- ################################################################################ - # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation +# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md b/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md index 4dc4713a9..98db47102 100644 --- a/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md +++ b/charts/bpdm/charts/bpdm-orchestrator/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/), +## [3.0.0] - tbd + +### Changed + +- update app version to 6.0.0 + ## [2.0.4] - 2024-02-28 ### Added diff --git a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml index e88264808..f44568b60 100644 --- a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml +++ b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml @@ -21,15 +21,15 @@ apiVersion: v2 type: application name: bpdm-orchestrator -appVersion: "5.0.1" -version: 2.0.4 +appVersion: "6.0.0-alpha.0" +version: 3.0.0-alpha.0 description: A Helm chart for deploying the BPDM Orchestrator service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: - https://github.com/eclipse-tractusx/bpdm dependencies: - name: bpdm-common - version: 1.0.0 + version: 1.0.1 repository: "file://../bpdm-common" maintainers: - name: Nico Koprowski diff --git a/charts/bpdm/charts/bpdm-orchestrator/templates/ingress.yaml b/charts/bpdm/charts/bpdm-orchestrator/templates/ingress.yaml index 20f4b2a31..09efb62e8 100644 --- a/charts/bpdm/charts/bpdm-orchestrator/templates/ingress.yaml +++ b/charts/bpdm/charts/bpdm-orchestrator/templates/ingress.yaml @@ -1,6 +1,6 @@ --- ################################################################################ - # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation +# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership. diff --git a/charts/bpdm/charts/bpdm-pool/CHANGELOG.md b/charts/bpdm/charts/bpdm-pool/CHANGELOG.md index d83a2dd29..9a472773e 100644 --- a/charts/bpdm/charts/bpdm-pool/CHANGELOG.md +++ b/charts/bpdm/charts/bpdm-pool/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. The format is based on Keep a Changelog (https://keepachangelog.com/en/1.0.0/), +## [7.0.0] - tbd + +### Changed + +- update app version to 6.0.0 + ## [6.0.4] - 2024-03-29 ### Added diff --git a/charts/bpdm/charts/bpdm-pool/Chart.yaml b/charts/bpdm/charts/bpdm-pool/Chart.yaml index 21ad8b865..77644fe72 100644 --- a/charts/bpdm/charts/bpdm-pool/Chart.yaml +++ b/charts/bpdm/charts/bpdm-pool/Chart.yaml @@ -21,8 +21,8 @@ apiVersion: v2 type: application name: bpdm-pool -appVersion: "5.0.1" -version: 6.0.4 +appVersion: "6.0.0-alpha.0" +version: 7.0.0-alpha.0 description: A Helm chart for deploying the BPDM pool service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: @@ -34,7 +34,7 @@ dependencies: alias: postgres condition: postgres.enabled - name: bpdm-common - version: 1.0.0 + version: 1.0.1 repository: "file://../bpdm-common" maintainers: - name: Nico Koprowski diff --git a/charts/bpdm/charts/bpdm-pool/templates/ingress.yaml b/charts/bpdm/charts/bpdm-pool/templates/ingress.yaml index 20f4b2a31..09efb62e8 100644 --- a/charts/bpdm/charts/bpdm-pool/templates/ingress.yaml +++ b/charts/bpdm/charts/bpdm-pool/templates/ingress.yaml @@ -1,6 +1,6 @@ --- ################################################################################ - # Copyright (c) 2021,2024 Contributors to the Eclipse Foundation +# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional # information regarding copyright ownership.