From d99a17e249f41629211248c2691de30d2a46c990 Mon Sep 17 00:00:00 2001 From: Karsten Ludwig Hauser Date: Mon, 8 Jul 2024 11:31:04 +0200 Subject: [PATCH 1/3] fix(icm): use domain to check system status (#736) --- charts/icm-replication/values-iste_linux.tmpl | 2 ++ charts/icm/templates/test-job.yaml | 8 +++----- charts/icm/values-iste_linux.tmpl | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/charts/icm-replication/values-iste_linux.tmpl b/charts/icm-replication/values-iste_linux.tmpl index ee881443..87d08be4 100644 --- a/charts/icm-replication/values-iste_linux.tmpl +++ b/charts/icm-replication/values-iste_linux.tmpl @@ -358,6 +358,8 @@ icm-live: port: 1025 testrunner: + initContainerDomainNameLive: "${HELM_JOB_NAME}-live.${DNS_ZONE_NAME}" + initContainerDomainNameEdit: "${HELM_JOB_NAME}-edit.${DNS_ZONE_NAME}" nodeSelector: agentpool: agentpool2 image: diff --git a/charts/icm/templates/test-job.yaml b/charts/icm/templates/test-job.yaml index fce93e33..ddf20edd 100644 --- a/charts/icm/templates/test-job.yaml +++ b/charts/icm/templates/test-job.yaml @@ -88,12 +88,10 @@ spec: - -c - | {{- if index .Values "icm-as" "replication" "enabled" }} - until wget --server-response --spider http://{{ .Release.Name }}-ingress-nginx-controller/healthz 2>&1 | grep "HTTP/" | awk '{print $2}' | grep -q "200" && - wget --server-response --header "X-HEALTHCHECK: INTERSHOPAGENT" --spider http://{{ .Release.Name }}-icm-web-wa-live:8080/INTERSHOP/wastatus 2>&1 | grep -q "HTTP/1.1 200 OK" && - wget --server-response --header "X-HEALTHCHECK: INTERSHOPAGENT" --spider http://{{ .Release.Name }}-icm-web-wa-edit:8080/INTERSHOP/wastatus 2>&1 | grep -q "HTTP/1.1 200 OK"; do + until wget --server-response --header "X-HEALTHCHECK: INTERSHOPAGENT" https://{{ .Values.testrunner.initContainerDomainNameLive }}/INTERSHOP/wastatus 2>&1 | grep -q "HTTP/1.1 200 OK" && + wget --server-response --header "X-HEALTHCHECK: INTERSHOPAGENT" https://{{ .Values.testrunner.initContainerDomainNameEdit }}/INTERSHOP/wastatus 2>&1 | grep -q "HTTP/1.1 200 OK"; do {{- else }} - until wget --server-response --spider http://{{ .Release.Name }}-ingress-nginx-controller/healthz 2>&1 | grep "HTTP/" | awk '{print $2}' | grep -q "200" && - wget --server-response --header "X-HEALTHCHECK: INTERSHOPAGENT" --spider http://{{ .Release.Name }}-icm-web-wa:8080/INTERSHOP/wastatus 2>&1 | grep -q "HTTP/1.1 200 OK"; do + until wget --server-response --header "X-HEALTHCHECK: INTERSHOPAGENT" https://{{ .Values.testrunner.initContainerDomainName }}/INTERSHOP/wastatus 2>&1 | grep -q "HTTP/1.1 200 OK"; do {{- end }} echo "Readiness probe of application server has failed" sleep 5 diff --git a/charts/icm/values-iste_linux.tmpl b/charts/icm/values-iste_linux.tmpl index d0788319..2876167f 100644 --- a/charts/icm/values-iste_linux.tmpl +++ b/charts/icm/values-iste_linux.tmpl @@ -214,6 +214,7 @@ mailhog: port: 1025 testrunner: + initContainerDomainName: "${HELM_JOB_NAME}.${DNS_ZONE_NAME}" nodeSelector: agentpool: agentpool2 image: From 04a89f8ee3663eef4b0b51de1ecaa050752d15b8 Mon Sep 17 00:00:00 2001 From: khauser Date: Mon, 8 Jul 2024 09:32:28 +0000 Subject: [PATCH 2/3] chore: bump versions of icm:patch icm-replication:patch --- charts/icm-replication/.bumpversion.toml | 2 +- charts/icm-replication/Chart.yaml | 6 +++--- charts/icm/.bumpversion.toml | 2 +- charts/icm/Chart.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/icm-replication/.bumpversion.toml b/charts/icm-replication/.bumpversion.toml index f8256b78..e6c46844 100644 --- a/charts/icm-replication/.bumpversion.toml +++ b/charts/icm-replication/.bumpversion.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "2.1.4" +current_version = "2.1.5" [[tool.bumpversion.files]] filename = "Chart.yaml" diff --git a/charts/icm-replication/Chart.yaml b/charts/icm-replication/Chart.yaml index e41a27c4..9d571ad7 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.1.4 +version: 2.1.5 annotations: requestedMemoryQuota: 9Gi requestedCpuQuotaInMinutes: 3000 dependencies: - name: icm - version: 2.1.2 + version: 2.1.3 repository: file://../icm alias: icm-live - name: icm - version: 2.1.2 + version: 2.1.3 repository: file://../icm alias: icm-edit diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.bumpversion.toml index 4902e6e2..f8628c0a 100644 --- a/charts/icm/.bumpversion.toml +++ b/charts/icm/.bumpversion.toml @@ -1,5 +1,5 @@ [tool.bumpversion] -current_version = "2.1.2" +current_version = "2.1.3" [[tool.bumpversion.files]] filename = "Chart.yaml" diff --git a/charts/icm/Chart.yaml b/charts/icm/Chart.yaml index 28b35210..e514b837 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.1.2 +version: 2.1.3 # test related annotations annotations: requestedMemoryQuota: 5300Mi From 079836c5f9b4e3c0a75240c50625ff969f2796ce Mon Sep 17 00:00:00 2001 From: khauser Date: Mon, 8 Jul 2024 09:32:29 +0000 Subject: [PATCH 3/3] chore: generated changelog+release notes for icm:patch icm-replication:patch --- charts/icm-replication/CHANGELOG.md | 25 +++++++++++++++++++++++++ charts/icm-replication/RELEASE_NOTES.md | 8 ++++---- charts/icm/CHANGELOG.md | 15 +++++++++++++++ charts/icm/RELEASE_NOTES.md | 10 +++++----- 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/charts/icm-replication/CHANGELOG.md b/charts/icm-replication/CHANGELOG.md index c847da7c..f5c8926d 100644 --- a/charts/icm-replication/CHANGELOG.md +++ b/charts/icm-replication/CHANGELOG.md @@ -1,4 +1,28 @@ + +## [icm-replication-2.1.5](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.4...icm-replication-2.1.5) + +> 2024-07-08 + +### Chore + +* bump versions of icm:patch icm-replication:patch + +### Fix + +* **icm:** use domain to check system status ([#736](https://github.com/intershop/helm-charts/issues/736)) + + + +## [icm-replication-2.1.4](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.3...icm-replication-2.1.4) + +> 2024-07-05 + +### Chore + +* bump versions of icm:patch + + ## [icm-replication-2.1.3](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.2...icm-replication-2.1.3) @@ -6,6 +30,7 @@ ### Chore +* generated changelog+release notes for icm:patch icm-replication:patch * bump versions of icm:patch icm-replication:patch ### Fix diff --git a/charts/icm-replication/RELEASE_NOTES.md b/charts/icm-replication/RELEASE_NOTES.md index 0014189d..d6305b98 100644 --- a/charts/icm-replication/RELEASE_NOTES.md +++ b/charts/icm-replication/RELEASE_NOTES.md @@ -1,8 +1,8 @@ - -## [icm-replication-2.1.3](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.2...icm-replication-2.1.3) + +## [icm-replication-2.1.5](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.4...icm-replication-2.1.5) -> 2024-06-26 +> 2024-07-08 ### Chore @@ -10,5 +10,5 @@ ### Fix -* remove csi volume mount ([#709](https://github.com/intershop/helm-charts/issues/709)) +* **icm:** use domain to check system status ([#736](https://github.com/intershop/helm-charts/issues/736)) diff --git a/charts/icm/CHANGELOG.md b/charts/icm/CHANGELOG.md index 0262b6c1..da24b1e9 100644 --- a/charts/icm/CHANGELOG.md +++ b/charts/icm/CHANGELOG.md @@ -1,4 +1,18 @@ + +## [icm-2.1.3](https://github.com/intershop/helm-charts/compare/icm-2.1.2...icm-2.1.3) + +> 2024-07-08 + +### Chore + +* bump versions of icm:patch icm-replication:patch + +### Fix + +* **icm:** use domain to check system status ([#736](https://github.com/intershop/helm-charts/issues/736)) + + ## [icm-2.1.2](https://github.com/intershop/helm-charts/compare/icm-2.1.1...icm-2.1.2) @@ -6,6 +20,7 @@ ### Chore +* generated changelog+release notes for icm:patch * bump versions of icm:patch ### Fix diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md index 68a82cc5..8275ba0c 100644 --- a/charts/icm/RELEASE_NOTES.md +++ b/charts/icm/RELEASE_NOTES.md @@ -1,14 +1,14 @@ - -## [icm-2.1.2](https://github.com/intershop/helm-charts/compare/icm-2.1.1...icm-2.1.2) + +## [icm-2.1.3](https://github.com/intershop/helm-charts/compare/icm-2.1.2...icm-2.1.3) -> 2024-07-05 +> 2024-07-08 ### Chore -* bump versions of icm:patch +* bump versions of icm:patch icm-replication:patch ### Fix -* **icm:** check wa instead of as ([#286](https://github.com/intershop/helm-charts/issues/286)) ([#730](https://github.com/intershop/helm-charts/issues/730)) +* **icm:** use domain to check system status ([#736](https://github.com/intershop/helm-charts/issues/736))