From ac44f2d7e1b6455c1ce97e74422e597e837d7685 Mon Sep 17 00:00:00 2001
From: Chris <chgl@users.noreply.github.com>
Date: Tue, 21 Apr 2020 08:52:13 +0200
Subject: [PATCH] fix: use networking.k8s.io/v1beta1 apiVersion for ingress if
 supported (#312)

* use networking.k8s.io/v1beta1 apiVersion for ingress if supported
* updated chart version
* used more explicit capability check
---
 charts/argo-cd/templates/argocd-server/ingress.yaml | 4 ++++
 charts/argo/Chart.yaml                              | 2 +-
 charts/argo/templates/server-ingress.yaml           | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index c3a84ea4..df2f93ce 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -2,7 +2,11 @@
 {{- $serviceName := include "argo-cd.server.fullname" . -}}
 {{- $servicePort := .Values.server.service.servicePortHttp -}}
 {{- $paths := .Values.server.ingress.paths -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
 {{- if .Values.server.ingress.annotations }}
diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 33604dcb..523d30b3 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v2.6.1"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.7.3
+version: 0.7.4
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/server-ingress.yaml b/charts/argo/templates/server-ingress.yaml
index 5786e257..bee5a7f8 100644
--- a/charts/argo/templates/server-ingress.yaml
+++ b/charts/argo/templates/server-ingress.yaml
@@ -2,7 +2,11 @@
 {{- if .Values.server.ingress.enabled -}}
 {{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}}
 {{- $servicePort := .Values.server.servicePort -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
+apiVersion: networking.k8s.io/v1beta1
+{{ else }}
 apiVersion: extensions/v1beta1
+{{ end -}}
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-{{ .Values.server.name }}