From 9a613c06f85430bc39f2e6abd589899775600761 Mon Sep 17 00:00:00 2001 From: Karsten Ludwig Hauser Date: Mon, 25 Nov 2024 13:58:36 +0100 Subject: [PATCH 1/3] feat (icm): enable timeoutSeconds for icm-wa (#845) --- charts/icm-web/templates/wa-deployment.yaml | 3 +++ charts/icm-web/values.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/charts/icm-web/templates/wa-deployment.yaml b/charts/icm-web/templates/wa-deployment.yaml index e813946f..178cadc6 100644 --- a/charts/icm-web/templates/wa-deployment.yaml +++ b/charts/icm-web/templates/wa-deployment.yaml @@ -180,6 +180,7 @@ 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 }} @@ -187,6 +188,7 @@ spec: 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 index 8220c4b8..407a3279 100644 --- 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 From 1804b35aba595d1e32e12644f80ae06b02437860 Mon Sep 17 00:00:00 2001 From: khauser Date: Mon, 25 Nov 2024 13:00:12 +0000 Subject: [PATCH 2/3] chore: bump versions of icm-web:minor --- charts/icm-replication/.bumpversion.toml | 2 +- charts/icm-replication/Chart.yaml | 6 +++--- charts/icm-web/.bumpversion.toml | 2 +- charts/icm-web/Chart.yaml | 2 +- charts/icm/.bumpversion.toml | 2 +- charts/icm/Chart.yaml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml index b973e348..59561376 100644 --- 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 index ac2d4f7a..8e9c9f7e 100644 --- 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 index 1b8ec3ca..40be3c52 100644 --- 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/Chart.yaml b/charts/icm-web/Chart.yaml index cbc572ab..97e0ee42 100644 --- 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/.bumpversion.toml b/charts/icm/.bumpversion.toml index f7d31d12..ef1eb85e 100644 --- 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 index 7c0df986..3e3164d7 100644 --- 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 From c2029c9680b8310a03fe177bf1ffe0783457301b Mon Sep 17 00:00:00 2001 From: khauser Date: Mon, 25 Nov 2024 13:00:13 +0000 Subject: [PATCH 3/3] chore: generated changelog+release notes for icm-web:minor --- charts/icm-web/CHANGELOG.md | 11 +++++++++++ charts/icm-web/RELEASE_NOTES.md | 12 ++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/charts/icm-web/CHANGELOG.md b/charts/icm-web/CHANGELOG.md index b2e75917..2c99a982 100644 --- a/charts/icm-web/CHANGELOG.md +++ b/charts/icm-web/CHANGELOG.md @@ -1,4 +1,14 @@ + +## [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 + + ## [icm-web-0.12.1](https://github.com/intershop/helm-charts/compare/icm-web-0.12.0...icm-web-0.12.1) @@ -6,6 +16,7 @@ ### 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/RELEASE_NOTES.md b/charts/icm-web/RELEASE_NOTES.md index de95f117..6397fa3d 100644 --- a/charts/icm-web/RELEASE_NOTES.md +++ b/charts/icm-web/RELEASE_NOTES.md @@ -1,14 +1,10 @@ - -## [icm-web-0.12.1](https://github.com/intershop/helm-charts/compare/icm-web-0.12.0...icm-web-0.12.1) + +## [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