Merge pull request #839 from eclipse-tractusx/feat/charts/app-version…

…-6.0.0-alpha.0 feat(charts): increase app version to 6.0.0-alpha.0
eclipse-tractusx · Mar 29, 2024 · ef85356 · ef85356
2 parents 915ffef + 427bcf8
commit ef85356
Show file tree

Hide file tree

Showing 20 changed files with 59 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...rts/bpdm-common/templates/_configMap.yaml → ...arts/bpdm-common/templates/_configMap.tpl b/...rts/bpdm-common/templates/_configMap.yaml → ...arts/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 -}}
diff --git a/...ts/bpdm-common/templates/_deployment.yaml → ...rts/bpdm-common/templates/_deployment.tpl b/...ts/bpdm-common/templates/_deployment.yaml → ...rts/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
@@ -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/...harts/bpdm-common/templates/_ingress.yaml → ...charts/bpdm-common/templates/_ingress.tpl b/...harts/bpdm-common/templates/_ingress.yaml → ...charts/bpdm-common/templates/_ingress.tpl
diff --git a/...charts/bpdm-common/templates/_secret.yaml → .../charts/bpdm-common/templates/_secret.tpl b/...charts/bpdm-common/templates/_secret.yaml → .../charts/bpdm-common/templates/_secret.tpl
diff --git a/...harts/bpdm-common/templates/_service.yaml → ...charts/bpdm-common/templates/_service.tpl b/...harts/bpdm-common/templates/_service.yaml → ...charts/bpdm-common/templates/_service.tpl
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.