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

Release icm-web:minor
intershop · Nov 25, 2024 · 916b9b9 · 916b9b9
2 parents 6808538 + c2029c9
commit 916b9b9
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 17 deletions.
diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.7.0"
+current_version = "2.8.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.7.0
+version: 2.8.0
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.7.0
+    version: 2.8.0
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.7.0
+    version: 2.8.0
     repository: file://../icm
     alias: icm-edit
diff --git a/charts/icm-web/.bumpversion.toml b/charts/icm-web/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.12.1"
+current_version = "0.13.0"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm-web/CHANGELOG.md b/charts/icm-web/CHANGELOG.md
@@ -1,11 +1,22 @@
 
+<a name="icm-web-0.13.0"></a>
+## [icm-web-0.13.0](https://github.com/intershop/helm-charts/compare/icm-web-0.12.1...icm-web-0.13.0)
+
+> 2024-11-25
+
+### Chore
+
+* bump versions of icm-web:minor
+
+
 <a name="icm-web-0.12.1"></a>
 ## [icm-web-0.12.1](https://github.com/intershop/helm-charts/compare/icm-web-0.12.0...icm-web-0.12.1)
 
 > 2024-11-22
 
 ### Chore
 
+* generated changelog+release notes for icm-as:minor icm-web:patch
 * bump versions of icm-as:minor icm-web:patch
 
 ### Fix

diff --git a/charts/icm-web/Chart.yaml b/charts/icm-web/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "11.0.13"
 description: Intershop Commerce Management - Web Adapter and Web Adapter Agent
 # name and version must be in this exact order, otherwise bump2version won't work
 name: icm-web
-version: 0.12.1
+version: 0.13.0
diff --git a/charts/icm-web/RELEASE_NOTES.md b/charts/icm-web/RELEASE_NOTES.md
@@ -1,14 +1,10 @@
 
-<a name="icm-web-0.12.1"></a>
-## [icm-web-0.12.1](https://github.com/intershop/helm-charts/compare/icm-web-0.12.0...icm-web-0.12.1)
+<a name="icm-web-0.13.0"></a>
+## [icm-web-0.13.0](https://github.com/intershop/helm-charts/compare/icm-web-0.12.1...icm-web-0.13.0)
 
-> 2024-11-22
+> 2024-11-25
 
 ### Chore
 
-* bump versions of icm-as:minor icm-web:patch
-
-### Fix
-
-* fix ingress annotation conflict in icm-web chart ([#834](https://github.com/intershop/helm-charts/issues/834))
+* bump versions of icm-web:minor
 
diff --git a/charts/icm-web/templates/wa-deployment.yaml b/charts/icm-web/templates/wa-deployment.yaml
@@ -180,13 +180,15 @@ spec:
             initialDelaySeconds: {{ .Values.webadapter.probes.startup.initialDelaySeconds | default 0 }}
             periodSeconds: {{ .Values.webadapter.probes.startup.periodSeconds | default 5 }}
             failureThreshold: {{ .Values.webadapter.probes.startup.failureThreshold | default 6 }}
+            timeoutSeconds: {{ .Values.webadapter.probes.startup.timeoutSeconds | default 1 }}
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.httpPort }}
             # Check every 10s up to a total timeout of 30s
             initialDelaySeconds: {{ .Values.webadapter.probes.liveness.initialDelaySeconds | default 0 }}
             periodSeconds: {{ .Values.webadapter.probes.liveness.periodSeconds | default 10 }}
             failureThreshold: {{ .Values.webadapter.probes.liveness.failureThreshold | default 3 }}
+            timeoutSeconds: {{ .Values.webadapter.probes.liveness.timeoutSeconds | default 1 }}
           readinessProbe:
             httpGet:
               # /INTERSHOP/wastatus response code is directly linked to configuration servlet availability/validity and
@@ -200,6 +202,7 @@ spec:
             initialDelaySeconds: {{ .Values.webadapter.probes.readiness.initialDelaySeconds | default 0 }}
             periodSeconds: {{ .Values.webadapter.probes.readiness.periodSeconds | default 10 }}
             failureThreshold: {{ .Values.webadapter.probes.readiness.failureThreshold | default 3 }}
+            timeoutSeconds: {{ .Values.webadapter.probes.readiness.timeoutSeconds | default 1 }}
           volumeMounts:
           {{- if .Values.webadapter.customHttpdConfig }}
           - name: httpd-config-volume

diff --git a/charts/icm-web/values.yaml b/charts/icm-web/values.yaml
@@ -37,14 +37,17 @@ webadapter:
     #  initialDelaySeconds: 0
     #  periodSeconds: 5
     #  failureThreshold: 6
+    #  timeoutSeconds: 1
     liveness: {}
     #  initialDelaySeconds: 0
     #  periodSeconds: 10
     #  failureThreshold: 3
+    #  timeoutSeconds: 1
     readiness: {}
     #  initialDelaySeconds: 0
     #  periodSeconds: 10
     #  failureThreshold: 3
+    #  timeoutSeconds: 1
   sslCertificateRetrieval:
     enabled: false
     supportV1: false

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

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.7.0
+version: 2.8.0
 # test related annotations
 annotations:
   requestedMemoryQuota: 6000Mi
@@ -13,7 +13,7 @@ dependencies:
     version: 2.3.0
     repository: file://../icm-as
   - name: icm-web
-    version: 0.12.1
+    version: 0.13.0
     repository: file://../icm-web
     condition: icm-web.enabled
   - name: ingress-nginx