From 1b21ce28105b676f5e5a5116984820bf93b6ba8c Mon Sep 17 00:00:00 2001
From: skuethe <skuethe@noreply.gitea.io>
Date: Tue, 8 Dec 2020 20:57:52 +0800
Subject: [PATCH] Fix capabilities query for Ingress on 1.18 and older (#78)

Co-authored-by: Sebastian Kuethe <sebastian.kuethe@she.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/78
Reviewed-by: luhahn <luhahn@noreply.gitea.io>
Reviewed-by: lafriks <lafriks@noreply.gitea.io>
Co-Authored-By: skuethe <skuethe@noreply.gitea.io>
Co-Committed-By: skuethe <skuethe@noreply.gitea.io>
---
 templates/gitea/ingress.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/gitea/ingress.yaml b/templates/gitea/ingress.yaml
index d56455a..e6e2dc6 100644
--- a/templates/gitea/ingress.yaml
+++ b/templates/gitea/ingress.yaml
@@ -1,9 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "gitea.fullname" . -}}
 {{- $httpPort := .Values.service.http.port -}}
-{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
 apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -36,7 +36,7 @@ spec:
           - path: /
             pathType: Prefix
             backend:
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
               service:
                 name: {{ $fullName }}-http
                 port: