Merge pull request #741 from intershop/feature/pwa/integrate-main

chore: integrate main to develop/pwa
intershop · Jul 9, 2024 · 7003873 · 7003873
2 parents d805c7b + 2b10c8d
commit 7003873
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 20 deletions.
diff --git 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/CHANGELOG.md b/charts/icm-replication/CHANGELOG.md
@@ -1,11 +1,36 @@
 
+<a name="icm-replication-2.1.5"></a>
+## [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))
+
+
+<a name="icm-replication-2.1.4"></a>
+## [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
+
+
 <a name="icm-replication-2.1.3"></a>
 ## [icm-replication-2.1.3](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.2...icm-replication-2.1.3)
 
 > 2024-06-26
 
 ### 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/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-replication/RELEASE_NOTES.md b/charts/icm-replication/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-replication-2.1.3"></a>
-## [icm-replication-2.1.3](https://github.com/intershop/helm-charts/compare/icm-replication-2.1.2...icm-replication-2.1.3)
+<a name="icm-replication-2.1.5"></a>
+## [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
 
 * bump versions of icm:patch icm-replication:patch
 
 ### 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-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/.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/CHANGELOG.md b/charts/icm/CHANGELOG.md
@@ -1,11 +1,26 @@
 
+<a name="icm-2.1.3"></a>
+## [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))
+
+
 <a name="icm-2.1.2"></a>
 ## [icm-2.1.2](https://github.com/intershop/helm-charts/compare/icm-2.1.1...icm-2.1.2)
 
 > 2024-07-05
 
 ### Chore
 
+* generated changelog+release notes for icm:patch
 * bump versions of icm:patch
 
 ### Fix

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.1.2
+version: 2.1.3
 # test related annotations
 annotations:
   requestedMemoryQuota: 5300Mi

diff --git a/charts/icm/RELEASE_NOTES.md b/charts/icm/RELEASE_NOTES.md
@@ -1,14 +1,14 @@
 
-<a name="icm-2.1.2"></a>
-## [icm-2.1.2](https://github.com/intershop/helm-charts/compare/icm-2.1.1...icm-2.1.2)
+<a name="icm-2.1.3"></a>
+## [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))
 
diff --git 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
@@ -214,6 +214,7 @@ mailhog:
               port: 1025
 
 testrunner:
+  initContainerDomainName: "${HELM_JOB_NAME}.${DNS_ZONE_NAME}"
   nodeSelector:
     agentpool: agentpool2
   image: