From b5421b4ccd96df6c82cbe10b97d8bd308cd99787 Mon Sep 17 00:00:00 2001
From: "Nicholas St. Germain" <nick@cajun.pro>
Date: Wed, 14 Apr 2021 22:46:21 -0500
Subject: [PATCH] update ingress for v1

Signed-off-by: Nicholas St. Germain <nick@cajun.pro>
---
 .../argo-cd/templates/argocd-server/ingress.yaml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index d4e5020f..1dcf1b56 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -3,11 +3,13 @@
 {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingress.https -}}
 {{- $paths := .Values.server.ingress.paths -}}
 {{- $extraPaths := .Values.server.ingress.extraPaths -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-apiVersion: networking.k8s.io/v1beta1
-{{ else }}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: extensions/v1beta1
-{{ end -}}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: networking.k8s.io/v1
+{{- end }}
 kind: Ingress
 metadata:
 {{- if .Values.server.ingress.annotations }}
@@ -34,6 +36,9 @@ spec:
   {{- end }}
   {{- range $p := $paths }}
           - path: {{ $p }}
+            {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+            pathType: Prefix
+            {{- end }}
             backend:
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
@@ -47,6 +52,9 @@ spec:
   {{- end }}
   {{- range $p := $paths }}
           - path: {{ $p }}
+            {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+            pathType: Prefix
+            {{- end }}
             backend:
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}