Merge pull request #885 from intershop/release/develop/common

Release icm:patch icm-as:patch
intershop · Jan 10, 2025 · a34c6ee · a34c6ee
2 parents 7812937 + 73f70d9
commit a34c6ee
Show file tree

Hide file tree

Showing 14 changed files with 169 additions and 73 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -27,16 +27,18 @@ If you have any questions feel free to also send them to this email address.
 ## Contribution process
 
 1. Fork the repository
-2. Use the `main` branch for your edits
+2. Use the appropriate `develop\?` branch as base for your feature branch. See [Release Process](https://github.com/intershop/helm-charts/wiki/Release-Process)
 3. Work on changes
 4. Comment the changes
 5. Check whether the changes comply with the the rules (design etc.)
-6. Create a pull request
+6. Commit changes according to our Commit Message Guidelines
+6. Create a pull request into the `develop\?` base branch
 7. Add as much information as needed
 8. Reference the solved issue
 9. Wait for the review
 10. PR is approved, denied (with explanation) or sent back for further information
 11. We are trying to react as fast as possible to pull-request, issues, feedback and any other community interaction. However, we can’t guarantee a particular timeframe for every answer. We hope you understand and apologize for any inconveniences.
+12. If PR is approved the changes shall be merged via squash commit to improve commit history readability
 
 ## Commit Message Guidelines
 
@@ -48,6 +50,10 @@ Some rules to be emphasized for chart related commits:
 * A commit message starting with `feat(icm):` (or e.g.: `feat(pwa):`) will get a _MINOR_ change.
 * The rest will be _PATCH_.
 
-Chart unreleated commits (like e.g. docs, chore, build, test) will not be taken into account but still should be conventional and informative as possible.
+Please also enhance your commit message with an existing **github issue number**, where detailed information could be found. Github will later on link the commit to the issue ticket automatically.
 
-All of this will help to read and interpret our changlogs and release notes.
+Here is a sample commit message: `feat(icm): my short commit description (#123)`
+
+Chart unrelated commits (like e.g. docs, chore, build, test) will not be taken into account but still should be conventional and informative as possible.
+
+All of this will help to read and interpret our changlogs and release notes.
diff --git a/charts/icm-as/.bumpversion.toml b/charts/icm-as/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.5.0"
+current_version = "2.5.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm-as/CHANGELOG.md b/charts/icm-as/CHANGELOG.md
@@ -1,11 +1,26 @@
 
+<a name="icm-as-2.5.1"></a>
+## [icm-as-2.5.1](https://github.com/intershop/helm-charts/compare/icm-as-2.5.0...icm-as-2.5.1)
+
+> 2025-01-09
+
+### Chore
+
+* bump versions of icm:patch icm-as:patch
+
+### Docs
+
+* **common:** link "Release Process"-wiki page to the contribution rules ([#867](https://github.com/intershop/helm-charts/issues/867))
+
+
 <a name="icm-as-2.5.0"></a>
 ## [icm-as-2.5.0](https://github.com/intershop/helm-charts/compare/icm-as-2.4.1...icm-as-2.5.0)
 
-> 2025-01-07
+> 2025-01-08
 
 ### Chore
 
+* generated changelog+release notes for icm-as:minor
 * bump versions of icm-as:minor
 
 ### Feat

diff --git a/charts/icm-as/Chart.yaml b/charts/icm-as/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm-as
-version: 2.5.0
+version: 2.5.1
 description: Intershop Commerce Management - AppServer
 type: application
 appVersion: 11.10.3-LTS
diff --git a/charts/icm-as/RELEASE_NOTES.md b/charts/icm-as/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-as-2.5.0"></a>
-## [icm-as-2.5.0](https://github.com/intershop/helm-charts/compare/icm-as-2.4.1...icm-as-2.5.0)
+<a name="icm-as-2.5.1"></a>
+## [icm-as-2.5.1](https://github.com/intershop/helm-charts/compare/icm-as-2.5.0...icm-as-2.5.1)
 
-> 2025-01-07
+> 2025-01-09
 
 ### Chore
 
-* bump versions of icm-as:minor
+* bump versions of icm:patch icm-as:patch
 
-### Feat
+### Docs
 
-* **icm:** jgroups location directory configurable ([#865](https://github.com/intershop/helm-charts/issues/865))
+* **common:** link "Release Process"-wiki page to the contribution rules ([#867](https://github.com/intershop/helm-charts/issues/867))
 
diff --git a/charts/icm-as/values.yaml b/charts/icm-as/values.yaml
@@ -337,13 +337,13 @@ persistence:
 # Probes, all values are optional, below are the defaults
 probes:
   startup: {}
-  #    failureThreshold: 6
-  #    initialDelaySeconds: 60
-  #    periodSeconds: 10
+#    failureThreshold: 6
+#    initialDelaySeconds: 60
+#    periodSeconds: 10
   liveness: {}
-  #    failureThreshold: 3
-  #    initialDelaySeconds: 0
-  #    periodSeconds: 10
+#    failureThreshold: 3
+#    initialDelaySeconds: 0
+#    periodSeconds: 10
   readiness: {}
 #    failureThreshold: 3
 #    initialDelaySeconds: 0
@@ -527,27 +527,27 @@ replication:
   # The following "source" and "targets" configuration blocks take precedence over
   # the deprecated "targetSystemUrl" / "sourceDatabaseName" configurations
   # Configuration for source system that participates in replication
-  # source:
-    # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
-    # webserverUrl: <sourceExternalUrl>
-    # either mutual exclusive databaseUser or databaseLink have to be configured
-    # databaseLink: <sourceDatabaseLink>
-    # databaseUser: <sourceDatabaseUser>
-    # databaseName: <sourceDatabaseName>
+#  source:
+#    # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
+#    webserverUrl: <sourceExternalUrl>
+#    # either mutual exclusive databaseUser or databaseLink have to be configured
+#    databaseLink: <sourceDatabaseLink>
+#    databaseUser: <sourceDatabaseUser>
+#    databaseName: <sourceDatabaseName>
 
   # Configuration for all target systems that participates in replication
-  # targets:
-    # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
-    # live1:
-      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-      # webserverUrl: <targetExternalUrl>
-      # this database user will be granted access to the database schema of the source replication system
-      # databaseUser: <targetDatabaseUser>
-    # live2:
-      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-      # webserverUrl: <targetExternalUrl>
-      # this database user will be granted access to the database schema of the source replication system
-      # databaseUser: <targetDatabaseUser>
+#  targets:
+#    # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
+#    live1:
+#      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#      webserverUrl: <targetExternalUrl>
+#      # this database user will be granted access to the database schema of the source replication system
+#      databaseUser: <targetDatabaseUser>
+#    live2:
+#      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#      webserverUrl: <targetExternalUrl>
+#      # this database user will be granted access to the database schema of the source replication system
+#      databaseUser: <targetDatabaseUser>
 
 # Configuration of messaging via jgroups
 jgroups:

diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.10.0"
+current_version = "2.10.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm-replication/Chart.yaml b/charts/icm-replication/Chart.yaml
@@ -3,16 +3,16 @@ appVersion: "11.9.0"
 description: Intershop Commerce Management - ICM Replication
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm-replication
-version: 2.10.0
+version: 2.10.1
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.10.0
+    version: 2.10.1
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.10.0
+    version: 2.10.1
     repository: file://../icm
     alias: icm-edit
diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.10.0"
+current_version = "2.10.1"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm/CHANGELOG.md b/charts/icm/CHANGELOG.md
@@ -1,11 +1,86 @@
 
+<a name="icm-2.10.1"></a>
+## [icm-2.10.1](https://github.com/intershop/helm-charts/compare/icm-2.10.0...icm-2.10.1)
+
+> 2025-01-09
+
+### Chore
+
+* bump versions of icm:patch icm-as:patch
+
+### Docs
+
+* **common:** link "Release Process"-wiki page to the contribution rules ([#867](https://github.com/intershop/helm-charts/issues/867))
+
+
+<a name="icm-2.10.0"></a>
+## [icm-2.10.0](https://github.com/intershop/helm-charts/compare/icm-2.9.1...icm-2.10.0)
+
+> 2025-01-08
+
+### Chore
+
+* bump versions of icm-as:minor
+
+
+<a name="icm-2.9.1"></a>
+## [icm-2.9.1](https://github.com/intershop/helm-charts/compare/icm-2.9.0...icm-2.9.1)
+
+> 2025-01-07
+
+### Chore
+
+* bump versions of icm-as:patch
+
+
+<a name="icm-2.9.0"></a>
+## [icm-2.9.0](https://github.com/intershop/helm-charts/compare/icm-2.8.1...icm-2.9.0)
+
+> 2024-12-12
+
+### Chore
+
+* bump versions of icm-as:minor icm-web:patch
+
+
+<a name="icm-2.8.1"></a>
+## [icm-2.8.1](https://github.com/intershop/helm-charts/compare/icm-2.8.0...icm-2.8.1)
+
+> 2024-11-26
+
+### Chore
+
+* bump versions of icm-web:patch
+
+
+<a name="icm-2.8.0"></a>
+## [icm-2.8.0](https://github.com/intershop/helm-charts/compare/icm-2.7.0...icm-2.8.0)
+
+> 2024-11-25
+
+### Chore
+
+* bump versions of icm-web:minor
+
+
+<a name="icm-2.7.0"></a>
+## [icm-2.7.0](https://github.com/intershop/helm-charts/compare/icm-2.6.0...icm-2.7.0)
+
+> 2024-11-22
+
+### Chore
+
+* bump versions of icm-as:minor icm-web:patch
+
+
 <a name="icm-2.6.0"></a>
 ## [icm-2.6.0](https://github.com/intershop/helm-charts/compare/icm-2.5.2...icm-2.6.0)
 
 > 2024-09-03
 
 ### Chore
 
+* generated changelog+release notes for icm:minor icm-as:minor icm-replication:minor
 * bump versions of icm:minor icm-as:minor icm-replication:minor
 
 ### Feat

diff --git a/charts/icm/Chart.yaml b/charts/icm/Chart.yaml
@@ -3,14 +3,14 @@ appVersion: "12.0.0"
 description: Intershop Commerce Management - ICM
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm
-version: 2.10.0
+version: 2.10.1
 # test related annotations
 annotations:
   requestedMemoryQuota: 6000Mi
   requestedCpuQuotaInMinutes: "2200"
 dependencies:
   - name: icm-as
-    version: 2.5.0
+    version: 2.5.1
     repository: file://../icm-as
   - name: icm-web
     version: 0.13.2

diff --git a/charts/icm/README.md b/charts/icm/README.md
@@ -67,7 +67,7 @@ Prerequisites are:
 * [helm-unittest](https://github.com/helm-unittest/helm-unittest)
 
 ```bash
-helm unittest --helm3  --output-file unit.xml --output-type JUnit charts/icm
+helm unittest --output-file unit.xml --output-type JUnit charts/icm
 ```
 
 ### ct lint & install

diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-2.6.0"></a>
-## [icm-2.6.0](https://github.com/intershop/helm-charts/compare/icm-2.5.2...icm-2.6.0)
+<a name="icm-2.10.1"></a>
+## [icm-2.10.1](https://github.com/intershop/helm-charts/compare/icm-2.10.0...icm-2.10.1)
 
-> 2024-09-03
+> 2025-01-09
 
 ### Chore
 
-* bump versions of icm:minor icm-as:minor icm-replication:minor
+* bump versions of icm:patch icm-as:patch
 
-### Feat
+### Docs
 
-* **icm:** New replication environment configuration ([#803](https://github.com/intershop/helm-charts/issues/803))
+* **common:** link "Release Process"-wiki page to the contribution rules ([#867](https://github.com/intershop/helm-charts/issues/867))
 
diff --git a/charts/icm/values.yaml b/charts/icm/values.yaml
@@ -7,8 +7,8 @@ icm-as:
     "cluster-autoscaler.kubernetes.io/safe-to-evict": "false"
 
   image:
-  #  repository: intershophub/icm-as
-  #  tag: :11.0.12-dev1
+#    repository: intershophub/icm-as
+#    tag: :11.0.12-dev1
 
   ## define a secret for a container registry
   dockerSecret:
@@ -75,27 +75,27 @@ icm-as:
     # The following "source" and "targets" configuration blocks take precedence over
     # the deprecated "targetSystemUrl" / "sourceDatabaseName" configurations
     # Configuration for source system that participates in replication
-    # source:
-      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
-      # webserverUrl: <sourceExternalUrl>
-      # either mutual exclusive databaseUser or databaseLink have to be configured
-      # databaseLink: <sourceDatabaseLink>
-      # databaseUser: <sourceDatabaseUser>
-      # databaseName: <sourceDatabaseName>
+#    source:
+#      # the external URL of the webServer/proxy/ingress e.g. https://icm-web-edit-wa:443
+#      webserverUrl: <sourceExternalUrl>
+#      # either mutual exclusive databaseUser or databaseLink have to be configured
+#      databaseLink: <sourceDatabaseLink>
+#      databaseUser: <sourceDatabaseUser>
+#      databaseName: <sourceDatabaseName>
 
     # Configuration for all target systems that participates in replication
-    # targets:
-      # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
-      # live1:
-        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-        # webserverUrl: <targetExternalUrl>
-        # this database user will be granted access to the database schema of the source replication system
-        # databaseUser: <targetDatabaseUser>
-      # live2:
-        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
-        # webserverUrl: <targetExternalUrl>
-        # this database user will be granted access to the database schema of the source replication system
-        # databaseUser: <targetDatabaseUser>
+#    targets:
+#      # create multiple target systems - please avoid characters like '.', '-' or '_' in the chosen name/key
+#      live1:
+#        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#        webserverUrl: <targetExternalUrl>
+#        # this database user will be granted access to the database schema of the source replication system
+#        databaseUser: <targetDatabaseUser>
+#      live2:
+#        # the external URL of the webServer/proxy/ingress e.g. https://icm-web-live-wa:443
+#        webserverUrl: <targetExternalUrl>
+#        # this database user will be granted access to the database schema of the source replication system
+#        databaseUser: <targetDatabaseUser>
 
 icm-web:
   enabled: true