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

Release icm-as:patch
intershop · Jul 17, 2024 · fbbeb5d · fbbeb5d
2 parents 7bf3ea6 + bebc7ee
commit fbbeb5d
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 18 deletions.
diff --git a/charts/icm-as/.bumpversion.toml b/charts/icm-as/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.0.2"
+current_version = "2.0.3"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm-as/CHANGELOG.md b/charts/icm-as/CHANGELOG.md
@@ -1,16 +1,22 @@
 
-<a name="icm-as-2.0.2"></a>
-## [icm-as-2.0.2](https://github.com/intershop/helm-charts/compare/icm-as-2.0.1...icm-as-2.0.2)
+<a name="icm-as-2.0.3"></a>
+## [icm-as-2.0.3](https://github.com/intershop/helm-charts/compare/icm-as-2.0.2...icm-as-2.0.3)
 
-> 2024-06-14
+> 2024-07-17
 
 ### Chore
 
 * bump versions of icm-as:patch
 
 ### Fix
 
-* **icm:** fix typo ([#678](https://github.com/intershop/helm-charts/issues/678))
+* **icm:** the jgroups now has its own sc ([#751](https://github.com/intershop/helm-charts/issues/751)) ([#758](https://github.com/intershop/helm-charts/issues/758))
+
+
+<a name="icm-as-2.0.2"></a>
+## [icm-as-2.0.2](https://github.com/intershop/helm-charts/compare/icm-as-2.0.1...icm-as-2.0.2)
+
+> 2024-06-14
 
 
 <a name="icm-as-2.0.1"></a>

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.0.2
+version: 2.0.3
 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.0.2"></a>
-## [icm-as-2.0.2](https://github.com/intershop/helm-charts/compare/icm-as-2.0.1...icm-as-2.0.2)
+<a name="icm-as-2.0.3"></a>
+## [icm-as-2.0.3](https://github.com/intershop/helm-charts/compare/icm-as-2.0.2...icm-as-2.0.3)
 
-> 2024-06-14
+> 2024-07-17
 
 ### Chore
 
 * bump versions of icm-as:patch
 
 ### Fix
 
-* **icm:** fix typo ([#678](https://github.com/intershop/helm-charts/issues/678))
+* **icm:** the jgroups now has its own sc ([#751](https://github.com/intershop/helm-charts/issues/751)) ([#758](https://github.com/intershop/helm-charts/issues/758))
 
diff --git a/charts/icm-as/templates/cluster-jgroups-pvc.yaml b/charts/icm-as/templates/cluster-jgroups-pvc.yaml
@@ -9,7 +9,7 @@ spec:
     - ReadWriteMany
   # use the storage class defined by cluster-sc.yaml
   {{- if .Values.persistence.jgroups.cluster.storageClass.create }}
-  storageClassName: "{{ template "icm-as.fullname" . }}-cluster-sites-sc"
+  storageClassName: "{{ template "icm-as.fullname" . }}-cluster-jgroups-sc"
   {{- else if gt (len .Values.persistence.jgroups.cluster.storageClass.existingClass) 0 }}
   storageClassName: {{ .Values.persistence.jgroups.cluster.storageClass.existingClass | quote }}
   {{- end }}

diff --git a/charts/icm-as/templates/cluster-jgroups-sc.yaml b/charts/icm-as/templates/cluster-jgroups-sc.yaml
@@ -0,0 +1,16 @@
+{{- if eq .Values.persistence.jgroups.type "cluster" -}}
+{{- if .Values.persistence.jgroups.cluster.storageClass.create -}}
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: {{ include "icm-as.fullname" . }}-cluster-jgroups-sc
+provisioner: kubernetes.io/azure-file
+allowVolumeExpansion: true
+mountOptions:
+{{- range .Values.persistence.jgroups.cluster.storageClass.mountOptions }}
+- {{ . }}
+{{- end }}
+parameters:
+  skuName: {{ .Values.persistence.jgroups.cluster.storageClass.skuName }}
+{{- end -}}
+{{- end -}}
diff --git a/charts/icm-as/tests/persistence-jgroups_test.yaml b/charts/icm-as/tests/persistence-jgroups_test.yaml
@@ -1,6 +1,8 @@
 suite: tests correctness of persistence.jgroups section
 templates:
   - templates/as-deployment.yaml
+  - templates/cluster-jgroups-sc.yaml
+  - templates/cluster-jgroups-pvc.yaml
 tests:
   - it: type=emptyDir in as-deployment
     release:
@@ -62,6 +64,86 @@ tests:
             persistentVolumeClaim:
               claimName: "custom-claim"
 
+  - it: type=use existing sc in cluster-jgroups-pvc
+    release:
+      name: icm-as
+    chart:
+      version: 0.8.15
+    values:
+      - ../values.yaml
+    set:
+      persistence.jgroups.type: cluster
+      persistence.jgroups.cluster.storageClass.create: false
+      persistence.jgroups.cluster.storageClass.existingClass: "custom-storage-class-name"
+    template: templates/cluster-jgroups-pvc.yaml
+    asserts:
+      - isKind:
+          of: PersistentVolumeClaim
+      - equal:
+          path: metadata.name
+          value: "icm-as-cluster-jgroups-pvc"
+      - equal:
+          path: spec.storageClassName
+          value: "custom-storage-class-name"
+
+  - it: type=create cluster-jgroups-sc
+    release:
+      name: icm-as
+    chart:
+      version: 0.8.15
+    values:
+      - ../values.yaml
+    set:
+      persistence.jgroups.type: cluster
+      persistence.jgroups.cluster.storageClass.create: true
+      persistence.jgroups.cluster.storageClass.existingClass: ""
+      persistence.jgroups.cluster.storageClass.skuName: Standard_LRS
+      persistence.jgroups.cluster.storageClass.mountOptions:
+      - uid=150
+      - gid=150
+      - dir_mode=0777
+      - file_mode=0777
+      - mfsymlinks
+      - cache=strict
+      - actimeo=30
+    template: templates/cluster-jgroups-sc.yaml
+    asserts:
+      - isKind:
+          of: StorageClass
+      - equal:
+          path: metadata.name
+          value: "icm-as-cluster-jgroups-sc"
+      - equal:
+          path: provisioner
+          value: kubernetes.io/azure-file
+      - equal:
+          path: allowVolumeExpansion
+          value: true
+      - equal:
+          path: mountOptions[0]
+          value: uid=150
+      - equal:
+          path: mountOptions[1]
+          value: gid=150
+      - equal:
+          path: mountOptions[2]
+          value: dir_mode=0777
+      - equal:
+          path: mountOptions[3]
+          value: file_mode=0777
+      - equal:
+          path: mountOptions[4]
+          value: mfsymlinks
+      - equal:
+          path: mountOptions[5]
+          value: cache=strict
+      - equal:
+          path: mountOptions[6]
+          value: actimeo=30
+      - equal:
+          path: parameters.skuName
+          value: Standard_LRS
+
   - it: type=azureFiles in as-deployment
     release:
       name: icm-as

diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.2.1"
+current_version = "2.2.2"
 
 [[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.2.1
+version: 2.2.2
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.2.1
+    version: 2.2.2
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.2.1
+    version: 2.2.2
     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.2.1"
+current_version = "2.2.2"
 
 [[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.2.1
+version: 2.2.2
 # test related annotations
 annotations:
   requestedMemoryQuota: 5300Mi
   requestedCpuQuotaInMinutes: "2000"
 dependencies:
   - name: icm-as
-    version: 2.0.2
+    version: 2.0.3
     repository: file://../icm-as
   - name: icm-web
     version: 0.10.0