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

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

Hide file tree

Showing 10 changed files with 51 additions and 18 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.5"
+current_version = "2.2.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.1.5
+version: 2.2.0
 annotations:
   requestedMemoryQuota: 9Gi
   requestedCpuQuotaInMinutes: 3000
 dependencies:
   - name: icm
-    version: 2.1.3
+    version: 2.2.0
     repository: file://../icm
     alias: icm-live
   - name: icm
-    version: 2.1.3
+    version: 2.2.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.9.1"
+current_version = "0.10.0"
 
 [[tool.bumpversion.files]]
 filename = "Chart.yaml"

diff --git a/charts/icm-web/CHANGELOG.md b/charts/icm-web/CHANGELOG.md
@@ -1,11 +1,26 @@
 
+<a name="icm-web-0.10.0"></a>
+## [icm-web-0.10.0](https://github.com/intershop/helm-charts/compare/icm-web-0.9.1...icm-web-0.10.0)
+
+> 2024-07-09
+
+### Chore
+
+* bump versions of icm-web:minor
+
+### Feat
+
+* **icm:** Try to schedule WA pods evenly over different nodes ([#729](https://github.com/intershop/helm-charts/issues/729))
+
+
 <a name="icm-web-0.9.1"></a>
 ## [icm-web-0.9.1](https://github.com/intershop/helm-charts/compare/icm-web-0.9.0...icm-web-0.9.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-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.9.1
+version: 0.10.0
diff --git a/charts/icm-web/RELEASE_NOTES.md b/charts/icm-web/RELEASE_NOTES.md
@@ -1,17 +1,14 @@
 
-<a name="icm-web-0.9.1"></a>
-## [icm-web-0.9.1](https://github.com/intershop/helm-charts/compare/icm-web-0.9.0...icm-web-0.9.1)
+<a name="icm-web-0.10.0"></a>
+## [icm-web-0.10.0](https://github.com/intershop/helm-charts/compare/icm-web-0.9.1...icm-web-0.10.0)
 
-> 2024-06-10
+> 2024-07-09
 
 ### 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-web:minor
 
-### Fix
+### Feat
 
-* Support graceful container shutdown of WebAdapterAgent
-* Support graceful container shutdown of WebAdapter
+* **icm:** Try to schedule WA pods evenly over different nodes ([#729](https://github.com/intershop/helm-charts/issues/729))
 
diff --git a/charts/icm-web/templates/wa-deployment.yaml b/charts/icm-web/templates/wa-deployment.yaml
@@ -42,6 +42,24 @@ spec:
       nodeSelector:
         {{- toYaml .Values.nodeSelector | trim | nindent 8 }}
       {{- end }}
+      {{- if and (not .Values.nodeSelector) (.Values.webadapter.schedulePodsPreferredEvenlyAcrossNodes) }}
+      affinity:
+        podAntiAffinity:
+          # Choose schedulability over pod anti-affinity preference satisfaction
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              # Spread WA pods evenly over nodes
+              # See ticket #95582 regarding the simultaneous kill at nearly the exact same moment,
+              # likely same node was affected by memory pressure
+              topologyKey: "kubernetes.io/hostname"
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values:
+                  - {{ include "icm-web.fullname" . }}-wa
+      {{- end }}
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- range .Values.imagePullSecrets }}

diff --git a/charts/icm-web/values.yaml b/charts/icm-web/values.yaml
@@ -72,6 +72,9 @@ webadapter:
     enabled: false
     binding: <name-of-the-binding>
 
+  # define if the scheduler should try to place the ReplicaSet of WA pods evenly over different nodes
+  schedulePodsPreferredEvenlyAcrossNodes: true
+
   # define custom labels for deployment and pods:
   deploymentLabels: {}
   podLabels: {}

diff --git a/charts/icm/.bumpversion.toml b/charts/icm/.bumpversion.toml
@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "2.1.3"
+current_version = "2.2.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.1.3
+version: 2.2.0
 # test related annotations
 annotations:
   requestedMemoryQuota: 5300Mi
@@ -13,7 +13,7 @@ dependencies:
     version: 2.0.2
     repository: file://../icm-as
   - name: icm-web
-    version: 0.9.1
+    version: 0.10.0
     repository: file://../icm-web
     condition: icm-web.enabled
   - name: ingress-nginx