Fix Ingress (#70)

Bump chart version to 2.0.7 Fix Ingress - Ingress uses now .Capabilities.APIVersions.Has to compare the api version available - Added pathType since it is required in v1 and optional in v1beta1 Co-authored-by: Lucas Hahn <lucas.hahn@novum-rgi.de> Reviewed-on: gitea/helm-chart#70 Reviewed-by: Andrew Thornton <art27@cantab.net> Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-Authored-By: luhahn <luhahn@noreply.gitea.io> Co-Committed-By: luhahn <luhahn@noreply.gitea.io>
2020-11-26 17:01:16 +08:00
parent fea1abddd9
commit 63bc10e393
2 changed files with 6 additions and 5 deletions
--- 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 semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} 
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" -}} 
 apiVersion: networking.k8s.io/v1 
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} 
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}} 
 apiVersion: networking.k8s.io/v1beta1 
 {{- else -}} 
 apiVersion: extensions/v1beta1 
@@ -34,13 +34,14 @@ spec:
 http: 
 paths: 
 - path: / 
+ pathType: Prefix 
 backend: 
- {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} 
+ {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} 
 service: 
 name: {{ $fullName }}-http 
 port: 
 number: {{ $httpPort }} 
- {{- else -}} 
+ {{- else }} 
 serviceName: {{ $fullName }}-http 
 servicePort: {{ $httpPort }} 
 {{- end }}