From cd21b38541911bc56c8c09a0ba40a575f84ffa40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20FLEURY?= <clement.fleury@owkin.com>
Date: Thu, 7 Nov 2024 12:04:33 +0100
Subject: [PATCH] fix(argo-workflows): Add unhealthyPodEvictionPolicy to
 workflow controller PDB
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Clément FLEURY <clement.fleury@owkin.com>
---
 charts/argo-workflows/Chart.yaml                              | 4 +++-
 .../controller/workflow-controller-deployment-pdb.yaml        | 3 +++
 charts/argo-workflows/values.yaml                             | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index cf7daa93..e4e29bfd 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v3.5.12
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.42.7
+version: 0.42.8
 icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 sources:
@@ -18,3 +18,5 @@ annotations:
   artifacthub.io/changes: |
     - kind: added
       description: Support lifecycle and terminationGracePeriodSeconds for server
+    - kind: added
+      description: explicitly set unhealthyPodEvictionPolicy to IfHealthyBudget in controller PDB
diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment-pdb.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment-pdb.yaml
index bee7c199..ef3166de 100644
--- a/charts/argo-workflows/templates/controller/workflow-controller-deployment-pdb.yaml
+++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment-pdb.yaml
@@ -14,6 +14,9 @@ spec:
   {{- else }}
   minAvailable: 0
   {{- end }}
+  {{- if .Values.controller.pdb.unhealthyPodEvictionPolicy }}
+  unhealthyPodEvictionPolicy: {{ .Values.controller.pdb.unhealthyPodEvictionPolicy }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "argo-workflows.selectorLabels" (dict "context" . "name" .Values.controller.name) | nindent 6 }}
diff --git a/charts/argo-workflows/values.yaml b/charts/argo-workflows/values.yaml
index 75135854..531a4772 100644
--- a/charts/argo-workflows/values.yaml
+++ b/charts/argo-workflows/values.yaml
@@ -345,6 +345,9 @@ controller:
     # minAvailable: 1
     # maxUnavailable: 1
 
+    # -- [unhealthyPodEvictionPolicy] generally available since k8s v1.31+
+    # unhealthyPodEvictionPolicy: IfHealthyBudget
+
   # -- [Node selector]
   nodeSelector:
     kubernetes.io/os: linux