From bfdbebc98762ca60cef843e74b3a7a4d4069dc54 Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Mon, 18 Apr 2022 20:21:58 +0100
Subject: [PATCH] [Woodpecker CI] Refactor ingress
---
charts/woodpecker-ci/Chart.yaml | 2 +-
.../templates/server-ingress.yaml | 24 +++++++++----------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/charts/woodpecker-ci/Chart.yaml b/charts/woodpecker-ci/Chart.yaml
index 648ed03..d37758d 100644
--- a/charts/woodpecker-ci/Chart.yaml
+++ b/charts/woodpecker-ci/Chart.yaml
@@ -5,6 +5,6 @@ name: woodpecker-ci
description: Woodpecker is a simple CI engine with great extensibility.
icon: https://helm-forks.s3.eu-west-2.amazonaws.com/icons/woodpecker-ci.png
-version: 0.2.3
+version: 0.3.0
appVersion: "0.15.1"
diff --git a/charts/woodpecker-ci/templates/server-ingress.yaml b/charts/woodpecker-ci/templates/server-ingress.yaml
index 061b0fe..33e6624 100644
--- a/charts/woodpecker-ci/templates/server-ingress.yaml
+++ b/charts/woodpecker-ci/templates/server-ingress.yaml
@@ -26,22 +26,11 @@ spec:
{{- if and .Values.server.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
ingressClassName: {{ .Values.server.ingress.className }}
{{- end }}
- {{- if .Values.server.ingress.tls }}
- tls:
- {{- range .Values.server.ingress.tls }}
- - hosts:
- {{- range .hosts }}
- - {{ . | quote }}
- {{- end }}
- secretName: {{ .secretName }}
- {{- end }}
- {{- end }}
rules:
- {{- range .Values.server.ingress.hosts }}
- - host: {{ .host | quote }}
+ - host: {{ .Values.server.host }}
http:
paths:
- {{- range .paths }}
+ {{- range .Values.server.ingress.paths }}
- path: {{ .path }}
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: {{ .pathType }}
@@ -57,5 +46,14 @@ spec:
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
+ {{- if .Values.server.tls }}
+ tls:
+ {{- range .Values.server.ingress.tls }}
+ - hosts:
+ {{- range .hosts }}
+ - {{ .Values.server.host | quote }}
+ {{- end }}
+ secretName: {{ $fullName }}-tls
{{- end }}
+ {{- end }}
{{- end }}
--
GitLab