Merge pull request #877 from intershop/release/develop/icm

Release icm-as:minor
intershop · Jan 8, 2025 · 7812937 · 7812937
2 parents 9956674 + 9ef82fa
commit 7812937
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 19 deletions.
diff --git a/charts/icm-as/.bumpversion.toml b/charts/icm-as/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.4.1"
+current_version = "2.5.0"
 
 [[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.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
+
+### Chore
+
+* bump versions of icm-as:minor
+
+### Feat
+
+* **icm:** jgroups location directory configurable ([#865](https://github.com/intershop/helm-charts/issues/865))
+
+
 <a name="icm-as-2.4.1"></a>
 ## [icm-as-2.4.1](https://github.com/intershop/helm-charts/compare/icm-as-2.4.0...icm-as-2.4.1)
 
 > 2025-01-07
 
 ### Chore
 
+* generated changelog+release notes for icm-as:patch
 * bump versions of icm-as:patch
 
 ### Fix

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.4.1
+version: 2.5.0
 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,15 +1,14 @@
 
-<a name="icm-as-2.4.1"></a>
-## [icm-as-2.4.1](https://github.com/intershop/helm-charts/compare/icm-as-2.4.0...icm-as-2.4.1)
+<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
 
 ### Chore
 
-* bump versions of icm-as:patch
+* bump versions of icm-as:minor
 
-### Fix
+### Feat
 
-* **icm:** use newer mssql image ([#871](https://github.com/intershop/helm-charts/issues/871))
-* **icm:** update kpi exporter schedule date ([#102730](https://github.com/intershop/helm-charts/issues/102730))
+* **icm:** jgroups location directory configurable ([#865](https://github.com/intershop/helm-charts/issues/865))
 
diff --git a/charts/icm-as/templates/jgroups-config-xml-cm.yaml b/charts/icm-as/templates/jgroups-config-xml-cm.yaml
@@ -46,7 +46,7 @@ data:
 {{- else if eq (include "icm-as.jgroups.discovery" .) "file_ping" }}
         <!-- discover nodes by shared FS -->
         <FILE_PING
-          location="/intershop/jgroups-share"
+          location="{{ default "/intershop/jgroups-share" .Values.jgroups.location }}"
           remove_old_coords_on_view_change="true"
           remove_all_data_on_view_change="true"
           write_data_on_find="true"
@@ -58,7 +58,7 @@ data:
           container="${jgroups.azure_ping.container:ping}"
 {{- else if eq (include "icm-as.jgroups.discovery" .) "dns_ping" }}
         <!-- discover nodes using azure protocol -->
-        <dns.DNS_PING 
+        <dns.DNS_PING
           dns_query="{{ .Values.jgroups.dnsQuery }}"
 {{- end }}
           {{- if .Values.jgroups -}}
@@ -95,4 +95,4 @@ data:
         <FRAG2 frag_size="60000"  />
         <RSVP resend_interval="2000" timeout="10000"/>
         <pbcast.STATE/>
-    </config>
+    </config>
diff --git a/charts/icm-as/tests/jgroups-config_test.yaml b/charts/icm-as/tests/jgroups-config_test.yaml
@@ -14,6 +14,23 @@ tests:
       - matchRegex:
           path: data["jgroups-config.xml"]
           pattern: <FILE_PING*
+      - matchRegex:
+          path: data["jgroups-config.xml"]
+          pattern: location="/intershop/jgroups-share"
+  - it: jgroups-config.xml FILE_PING optional location
+    release:
+      name: icm-as
+    chart:
+      version: 0.8.15
+    values:
+      - ../values.yaml
+    template: templates/jgroups-config-xml-cm.yaml
+    set:
+      jgroups.location: "/intershop/other-jgroups-directory"
+    asserts:
+      - matchRegex:
+          path: data["jgroups-config.xml"]
+          pattern: location="/intershop/other-jgroups-directory"
   - it: jgroups-config.xml configured to use KUB_PING
     release:
       name: icm-as

diff --git a/charts/icm-as/values.yaml b/charts/icm-as/values.yaml
@@ -551,7 +551,6 @@ replication:
 
 # Configuration of messaging via jgroups
 jgroups:
-
   # the discovery protocol to use
   # supported values are file_ping or kube_ping. Defaults to file_ping, but kube_ping | azure_ping is recommended
   # file_ping (default) requires a mounted file system
@@ -560,6 +559,11 @@ jgroups:
   # dns_ping (playground) declared dns query
   discovery: file_ping
 
+  # location allows to set a different (optional) directory for file_ping discovery protocol
+  # it needs to point into an existing e.g. mounted file system storage that is shared to other application servers
+  # e.g. '/intershop/sites/root/jgroups'
+  location:
+
   # extra attributes to be added at the ping-section in xml,
   # e.g. 'readTimeout="1000" operationAttempts="5"'
   # discoveryExtraAttributes: <extra-attributes>

diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.9.1"
+current_version = "2.10.0"
 
 [[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.9.1
+version: 2.10.0
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.9.1
+    version: 2.10.0
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.9.1
+    version: 2.10.0
     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.9.1"
+current_version = "2.10.0"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

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.9.1
+version: 2.10.0
 # test related annotations
 annotations:
   requestedMemoryQuota: 6000Mi
   requestedCpuQuotaInMinutes: "2200"
 dependencies:
   - name: icm-as
-    version: 2.4.1
+    version: 2.5.0
     repository: file://../icm-as
   - name: icm-web
     version: 0.13.2