From bf1f5601be01a848e4a9c095e3f8b961f9466628 Mon Sep 17 00:00:00 2001 From: joelgallant Date: Wed, 25 Nov 2020 06:55:49 +0800 Subject: [PATCH] Use apiVersion v1 for Ingress in 1.19+ (#63) Use apiVersion v1 for Ingress in 1.19+ Currently, a warning is shown in newer versions of kubernetes: ``` W1120 10:04:16.194312 8003 warnings.go:67] networking.k8s.io/v1beta1 Ingress is deprecated in v1.19+, unavailable in v1.22+; use networking.k8s.io/v1 Ingress ``` Co-authored-by: Joel Gallant Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/63 Reviewed-by: techknowlogick Reviewed-by: Andrew Thornton Co-Authored-By: joelgallant Co-Committed-By: joelgallant --- templates/gitea/ingress.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/gitea/ingress.yaml b/templates/gitea/ingress.yaml index aa5e508..b2ef2f2 100644 --- a/templates/gitea/ingress.yaml +++ b/templates/gitea/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "gitea.fullname" . -}} {{- $httpPort := .Values.service.http.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1