From 9e523b0538e353628818d983e133d6b72abdf161 Mon Sep 17 00:00:00 2001
From: Vadim Grek <vadimprog@gmail.com>
Date: Thu, 15 Dec 2022 10:33:36 +0200
Subject: [PATCH] chore(argo-events): use policy/v1 for poddisruptionbudgets,
 when available (#1710)

* Use policy/v1 for poddisruptionbudgets, when available

Signed-off-by: Vadim Grek <vadimprog@gmail.com>
---
 charts/argo-events/Chart.yaml                         |  6 ++----
 charts/argo-events/templates/_helpers.tpl             | 11 +++++++++++
 .../templates/argo-events-controller/pdb.yaml         |  2 +-
 .../templates/argo-events-webhook/pdb.yaml            |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 55cd3a95..39bf0659 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.7.3
 description: A Helm chart for Argo Events, the event-driven workflow automation framework
 name: argo-events
-version: 2.0.7
+version: 2.0.8
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-events/assets/logo.png
 keywords:
@@ -15,6 +15,4 @@ maintainers:
     url: https://argoproj.github.io/
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: avoid app.kubernetes.io/version kubernetes label from exceeding maximum length (63)
-    - "[Fixed]: generated value for app.kubernetes.io/version label is now valid even when defining a controller/webhook .image.tag with a SHA digest"
-    - "[Fixed]: webhook.image.tag value now overrides the tag in the webhook deployment"
+    - "[Fixed]: use policy/v1 for poddisruptionbudgets, when available
diff --git a/charts/argo-events/templates/_helpers.tpl b/charts/argo-events/templates/_helpers.tpl
index c3110b3f..d18f2ca9 100644
--- a/charts/argo-events/templates/_helpers.tpl
+++ b/charts/argo-events/templates/_helpers.tpl
@@ -125,3 +125,14 @@ Return the default Argo Events app version
 {{- define "argo-events.defaultTag" -}}
   {{- default .Chart.AppVersion .Values.global.image.tag }}
 {{- end -}}
+
+{{/*
+Define Pdb apiVersion
+*/}}
+{{- define "argo-events.pdb.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+{{- printf "policy/v1" -}}
+{{- else }}
+{{- printf "policy/v1beta1" -}}
+{{- end }}
+{{- end }}
diff --git a/charts/argo-events/templates/argo-events-controller/pdb.yaml b/charts/argo-events/templates/argo-events-controller/pdb.yaml
index 576fcfcf..f1a7b721 100644
--- a/charts/argo-events/templates/argo-events-controller/pdb.yaml
+++ b/charts/argo-events/templates/argo-events-controller/pdb.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.controller.pdb.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: {{ template "argo-events.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "argo-events.controller.fullname" . }}
diff --git a/charts/argo-events/templates/argo-events-webhook/pdb.yaml b/charts/argo-events/templates/argo-events-webhook/pdb.yaml
index 3bf08225..15bf97bf 100644
--- a/charts/argo-events/templates/argo-events-webhook/pdb.yaml
+++ b/charts/argo-events/templates/argo-events-webhook/pdb.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.webhook.enabled .Values.webhook.pdb.enabled (not .Values.controller.rbac.namespaced) }}
-apiVersion: policy/v1beta1
+apiVersion: {{ template "argo-events.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "argo-events.webhook.fullname" . }}