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: https://gitea.com/gitea/helm-chart/pulls/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>
2.0.6
2020-11-26 17:01:16 +08:00 · 2020-11-26 10:10:41 +08:00 · 2020-11-26 01:20:12 +08:00 · 2020-11-25 23:29:59 +08:00 · 2020-11-25 23:28:53 +08:00
2 changed files with 11 additions and 3 deletions
--- a/Chart.yaml
+++ b/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: gitea
 description: Gitea Helm chart for Kubernetes
 type: application
-version: 2.0.4
+version: 2.0.7
 appVersion: 1.12.6
 icon: https://docs.gitea.io/images/gitea.png

--- 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,8 +34,16 @@ spec:
      http:
        paths:
          - path: /
+            pathType: Prefix
            backend:
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+              service:
+                name: {{ $fullName }}-http
+                port:
+                  number: {{ $httpPort }}
+            {{- else }}
              serviceName: {{ $fullName }}-http
              servicePort: {{ $httpPort }}
+            {{- end }}
  {{- end }}
 {{- end }}
Author	SHA1	Message	Date
luhahn	63bc10e393	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: https://gitea.com/gitea/helm-chart/pulls/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
techknowlogick	fea1abddd9	2.0.6	2020-11-26 10:10:41 +08:00
joelgallant	33ee018b52	Fixes access of Capabilities variable (#67 ) Fixes access of Capabilities variable Co-authored-by: Joel Gallant <joel@joelgallant.me> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/67 Reviewed-by: techknowlogick <techknowlogick@gitea.io> Reviewed-by: luhahn <luhahn@noreply.gitea.io> Co-Authored-By: joelgallant <joelgallant@noreply.gitea.io> Co-Committed-By: joelgallant <joelgallant@noreply.gitea.io>	2020-11-26 01:20:12 +08:00
techknowlogick	13e210c75f	2.0.5	2020-11-25 23:29:59 +08:00
joelgallant	a26b4e10d1	Fixes networking.k8s.io/v1 Ingress fields (#65 ) Fixes ingress by using new {service: {name, port}} structure Co-authored-by: Joel Gallant <joel@joelgallant.me> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/65 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: techknowlogick <techknowlogick@gitea.io> Co-Authored-By: joelgallant <joelgallant@noreply.gitea.io> Co-Committed-By: joelgallant <joelgallant@noreply.gitea.io>	2020-11-25 23:28:53 +08:00