diff --git a/charts/element-web/templates/ingress.yaml b/charts/element-web/templates/ingress.yaml index 66f1f28..3b2fff5 100644 --- a/charts/element-web/templates/ingress.yaml +++ b/charts/element-web/templates/ingress.yaml @@ -1,10 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "element-web.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress metadata: diff --git a/charts/funkwhale/templates/ingress.yaml b/charts/funkwhale/templates/ingress.yaml index 46b0228..3b549ac 100644 --- a/charts/funkwhale/templates/ingress.yaml +++ b/charts/funkwhale/templates/ingress.yaml @@ -1,10 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "funkwhale.fullname" . -}} --- -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress metadata: diff --git a/charts/matrix-media-repo/templates/ingress.yaml b/charts/matrix-media-repo/templates/ingress.yaml index 7410839..7cd4998 100644 --- a/charts/matrix-media-repo/templates/ingress.yaml +++ b/charts/matrix-media-repo/templates/ingress.yaml @@ -1,10 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "matrix-media-repo.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress metadata: diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml index 6f806f5..3a8749a 100644 --- a/charts/matrix-synapse/templates/ingress.yaml +++ b/charts/matrix-synapse/templates/ingress.yaml @@ -1,10 +1,10 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "matrix-synapse.fullname" . -}} {{- $wkName := include "matrix-synapse.externalname" (dict "global" . "external" "wellknown-lighttpd") -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress metadata: diff --git a/charts/netbox/templates/ingress.yaml b/charts/netbox/templates/ingress.yaml index e55ee51..a847cd5 100644 --- a/charts/netbox/templates/ingress.yaml +++ b/charts/netbox/templates/ingress.yaml @@ -1,9 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "netbox.fullname" . -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress metadata: diff --git a/charts/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml index 1a7ea37..144ee9a 100644 --- a/charts/radosgw/templates/ingress.yaml +++ b/charts/radosgw/templates/ingress.yaml @@ -1,9 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "radosgw.fullname" . -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 {{- else -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress metadata: