diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml index d9b4cb91..df2f93ce 100644 --- a/charts/argo-cd/templates/argocd-server/ingress.yaml +++ b/charts/argo-cd/templates/argocd-server/ingress.yaml @@ -2,11 +2,11 @@ {{- $serviceName := include "argo-cd.server.fullname" . -}} {{- $servicePort := .Values.server.service.servicePortHttp -}} {{- $paths := .Values.server.ingress.paths -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{ else }} apiVersion: extensions/v1beta1 -{{- end }} +{{ end -}} kind: Ingress metadata: {{- if .Values.server.ingress.annotations }} diff --git a/charts/argo/templates/server-ingress.yaml b/charts/argo/templates/server-ingress.yaml index a6d603f2..bee5a7f8 100644 --- a/charts/argo/templates/server-ingress.yaml +++ b/charts/argo/templates/server-ingress.yaml @@ -2,11 +2,11 @@ {{- if .Values.server.ingress.enabled -}} {{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}} {{- $servicePort := .Values.server.servicePort -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} apiVersion: networking.k8s.io/v1beta1 -{{- else -}} +{{ else }} apiVersion: extensions/v1beta1 -{{- end }} +{{ end -}} kind: Ingress metadata: name: {{ .Release.Name }}-{{ .Values.server.name }}