2.0.5

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:29:59 +08:00 · 2020-11-25 23:28:53 +08:00 · 2020-11-25 06:56:12 +08:00 · 2020-11-25 06:55:49 +08:00 · 2020-11-20 16:08:26 +08:00
4 changed files with 14 additions and 2 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.3
+version: 2.0.5
 appVersion: 1.12.6
 icon: https://docs.gitea.io/images/gitea.png

--- a/templates/gitea/http-svc.yaml
+++ b/templates/gitea/http-svc.yaml
@ -4,6 +4,8 @@ metadata:
  name: {{ include "gitea.fullname" . }}-http
  labels:
    {{- include "gitea.labels" . | nindent 4 }}
+  annotations:
+    {{- toYaml .Values.service.http.annotations | nindent 4 }}
 spec:
  type: {{ .Values.service.http.type }}
  {{- if and .Values.service.http.loadBalancerIP (eq .Values.service.http.type "LoadBalancer") }}
--- 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
@ -33,7 +35,14 @@ spec:
        paths:
          - path: /
            backend:
+            {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+              service:
+                name: {{ $fullName }}-http
+                port:
+                  number: {{ $httpPort }}
+            {{- else -}}
              serviceName: {{ $fullName }}-http
              servicePort: {{ $httpPort }}
+            {{- end }}
  {{- end }}
 {{- end }}
--- a/values.yaml
+++ b/values.yaml
@ -17,6 +17,7 @@ service:
  http:
    type: ClusterIP
    port: 3000
+    annotations:
  ssh:
    type: ClusterIP
    port: 22
Author	SHA1	Message	Date
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
techknowlogick	76aee7b25b	2.0.4	2020-11-25 06:56:12 +08:00
joelgallant	bf1f5601be	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 <joel@joelgallant.me> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/63 Reviewed-by: techknowlogick <techknowlogick@gitea.io> Reviewed-by: Andrew Thornton <art27@cantab.net> Co-Authored-By: joelgallant <joelgallant@noreply.gitea.io> Co-Committed-By: joelgallant <joelgallant@noreply.gitea.io>	2020-11-25 06:55:49 +08:00
JPRbrs	729a412803	Allow templated annotations for http-service (#62 ) Get http annotations from the right place Allow templated annotations for http-service When deploying this to cloud Kubernetes, annotations are useful to add features to the http-service Co-authored-by: javier <perezrubio.javier@gmail.com> Reviewed-on: https://gitea.com/gitea/helm-chart/pulls/62 Reviewed-by: luhahn <luhahn@noreply.gitea.io> Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-Authored-By: JPRbrs <jprbrs@noreply.gitea.io> Co-Committed-By: JPRbrs <jprbrs@noreply.gitea.io>	2020-11-20 16:08:26 +08:00