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

Release icm:patch icm-replication:patch
intershop · Jun 18, 2024 · 39e9c67 · 39e9c67
2 parents fae303f + ba30884
commit 39e9c67
Show file tree

Hide file tree

Showing 12 changed files with 109 additions and 50 deletions.
diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.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-replication/CHANGELOG.md b/charts/icm-replication/CHANGELOG.md
@@ -1,11 +1,32 @@
 
+<a name="icm-replication-2.0.3"></a>
+## [icm-replication-2.0.3](https://github.com/intershop/helm-charts/compare/icm-replication-2.0.2...icm-replication-2.0.3)
+
+> 2024-06-18
+
+### Chore
+
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** fix local repl. exec and enable CSI secret creation ([#677](https://github.com/intershop/helm-charts/issues/677))
+
+
+<a name="icm-replication-2.0.2"></a>
+## [icm-replication-2.0.2](https://github.com/intershop/helm-charts/compare/icm-replication-2.0.1...icm-replication-2.0.2)
+
+> 2024-06-14
+
+
 <a name="icm-replication-2.0.1"></a>
 ## [icm-replication-2.0.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.0.0...icm-replication-2.0.1)
 
 > 2024-06-10
 
 ### Chore
 
+* generated changelog+release notes for icm:patch icm-as:patch icm-replication:patch icm-web:patch
 * bump versions of icm:patch icm-as:patch icm-replication:patch icm-web:patch
 * Consume WebAdapterAgent 4.0.1
 * Consume WebAdapter 2.5.0

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.0.2
+version: 2.0.3
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.0.2
+    version: 2.0.3
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.0.2
+    version: 2.0.3
     repository: file://../icm
     alias: icm-edit
diff --git a/charts/icm-replication/RELEASE_NOTES.md b/charts/icm-replication/RELEASE_NOTES.md
@@ -1,12 +1,14 @@
 
-<a name="icm-replication-2.0.1"></a>
-## [icm-replication-2.0.1](https://github.com/intershop/helm-charts/compare/icm-replication-2.0.0...icm-replication-2.0.1)
+<a name="icm-replication-2.0.3"></a>
+## [icm-replication-2.0.3](https://github.com/intershop/helm-charts/compare/icm-replication-2.0.2...icm-replication-2.0.3)
 
-> 2024-06-10
+> 2024-06-18
 
 ### Chore
 
-* bump versions of icm:patch icm-as:patch icm-replication:patch icm-web:patch
-* Consume WebAdapterAgent 4.0.1
-* Consume WebAdapter 2.5.0
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** fix local repl. exec and enable CSI secret creation ([#677](https://github.com/intershop/helm-charts/issues/677))
 
diff --git a/charts/icm-replication/values-iste_linux.tmpl b/charts/icm-replication/values-iste_linux.tmpl
@@ -330,6 +330,17 @@ icm-live:
         requests:
           cpu: 200m
           memory: 300Mi
+      extraVolumes:
+      - name: secrets-store-inline
+        csi:
+          driver: secrets-store.csi.k8s.io
+          readOnly: true
+          volumeAttributes:
+            secretProviderClass: "azure-tls"
+      extraVolumeMounts:
+      - name: secrets-store-inline
+        mountPath: "/mnt/secrets-store"
+        readOnly: true
 
   test:
     enabled: true

diff --git a/charts/icm-replication/values-test-local.tmpl b/charts/icm-replication/values-test-local.tmpl
@@ -13,24 +13,12 @@ icm-edit:
         enabled: true
         existingClaim: ${HELM_JOB_NAME}-icm-live-local-testdata-pvc
         mountPoint: /data
-    mssql:
-      enabled: true
-      acceptEula: "Y"
-      persistence:
-        data:
-          size: 1Gi
-          type: local
-          local:
-            path: ${LOCAL_MOUNT_BASE}/mssql-edit/data
-        backup:
-          size: 1Gi
-          type: local
-          local:
-            path: ${LOCAL_MOUNT_BASE}/mssql-edit/backup
-
-  ingress-nginx:
-    controller:
-      nodeSelector: null
+  icm-web:
+    nodeSelector: null
+    persistence:
+      customdata:
+        enabled: true
+        existingClaim: ${HELM_JOB_NAME}-icm-live-local-testdata-pvc
 
 icm-live:
   icm-as:
@@ -47,20 +35,16 @@ icm-live:
         enabled: true
         existingClaim: ${HELM_JOB_NAME}-icm-live-local-testdata-pvc
         mountPoint: /data
-    mssql:
-      enabled: true
-      acceptEula: "Y"
-      persistence:
-        data:
-          size: 1Gi
-          type: local
-          local:
-            path: ${LOCAL_MOUNT_BASE}/mssql-live/data
-        backup:
-          size: 1Gi
-          type: local
-          local:
-            path: ${LOCAL_MOUNT_BASE}/mssql-live/backup
+  icm-web:
+    nodeSelector: null
+    persistence:
+      customdata:
+        enabled: true
+        existingClaim: ${HELM_JOB_NAME}-icm-live-local-testdata-pvc
+
+  ingress-nginx:
+    controller:
+      nodeSelector: null
 
   mailhog:
     nodeSelector: null

diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.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/CHANGELOG.md b/charts/icm/CHANGELOG.md
@@ -1,11 +1,32 @@
 
+<a name="icm-2.0.3"></a>
+## [icm-2.0.3](https://github.com/intershop/helm-charts/compare/icm-2.0.2...icm-2.0.3)
+
+> 2024-06-18
+
+### Chore
+
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** fix local repl. exec and enable CSI secret creation ([#677](https://github.com/intershop/helm-charts/issues/677))
+
+
+<a name="icm-2.0.2"></a>
+## [icm-2.0.2](https://github.com/intershop/helm-charts/compare/icm-2.0.1...icm-2.0.2)
+
+> 2024-06-14
+
+
 <a name="icm-2.0.1"></a>
 ## [icm-2.0.1](https://github.com/intershop/helm-charts/compare/icm-2.0.0...icm-2.0.1)
 
 > 2024-06-10
 
 ### Chore
 
+* generated changelog+release notes for icm:patch icm-as:patch icm-replication:patch icm-web:patch
 * bump versions of icm:patch icm-as:patch icm-replication:patch icm-web:patch
 * Consume WebAdapterAgent 4.0.1
 * Consume WebAdapter 2.5.0

diff --git a/charts/icm/Chart.yaml b/charts/icm/Chart.yaml
@@ -3,7 +3,7 @@ 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.0.2
+version: 2.0.3
 # test related annotations
 annotations:
   requestedMemoryQuota: 5300Mi

diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md
@@ -1,12 +1,14 @@
 
-<a name="icm-2.0.1"></a>
-## [icm-2.0.1](https://github.com/intershop/helm-charts/compare/icm-2.0.0...icm-2.0.1)
+<a name="icm-2.0.3"></a>
+## [icm-2.0.3](https://github.com/intershop/helm-charts/compare/icm-2.0.2...icm-2.0.3)
 
-> 2024-06-10
+> 2024-06-18
 
 ### Chore
 
-* bump versions of icm:patch icm-as:patch icm-replication:patch icm-web:patch
-* Consume WebAdapterAgent 4.0.1
-* Consume WebAdapter 2.5.0
+* bump versions of icm:patch icm-replication:patch
+
+### Fix
+
+* **icm:** fix local repl. exec and enable CSI secret creation ([#677](https://github.com/intershop/helm-charts/issues/677))
 
diff --git a/charts/icm/values-iste_linux.tmpl b/charts/icm/values-iste_linux.tmpl
@@ -185,6 +185,17 @@ ingress-nginx:
       requests:
         cpu: 200m
         memory: 300Mi
+    extraVolumes:
+    - name: secrets-store-inline
+      csi:
+        driver: secrets-store.csi.k8s.io
+        readOnly: true
+        volumeAttributes:
+          secretProviderClass: "azure-tls"
+    extraVolumeMounts:
+    - name: secrets-store-inline
+      mountPath: "/mnt/secrets-store"
+      readOnly: true
 
   defaultBackend:
     enabled: false

diff --git a/charts/icm/values-test-local.tmpl b/charts/icm/values-test-local.tmpl
@@ -26,6 +26,13 @@ icm-as:
         type: local
         local:
           path: ${LOCAL_MOUNT_BASE}/mssql/backup
+icm-web:
+  nodeSelector: null
+  persistence:
+    customdata:
+      enabled: true
+      existingClaim: ${HELM_JOB_NAME}-local-testdata-pvc
+
 
 ingress-nginx:
   controller: