Update common and traefik to fix wildcard certs
Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
This commit is contained in:
parent
97dbb78a1e
commit
7af6f6b1a0
|
@ -1,6 +0,0 @@
|
|||
dependencies:
|
||||
- name: cert-manager
|
||||
repository: https://charts.jetstack.io
|
||||
version: v1.1.0
|
||||
digest: sha256:e85da7e5637ef559ea333dfe4e10e169b9cb3d976f826d587c420a82120589da
|
||||
generated: "2021-01-01T22:54:26.9144279+01:00"
|
|
@ -0,0 +1,9 @@
|
|||
dependencies:
|
||||
- name: cert-manager
|
||||
repository: https://charts.jetstack.io
|
||||
version: v1.1.0
|
||||
- name: reflector
|
||||
repository: https://emberstack.github.io/helm-charts
|
||||
version: 5.4.17
|
||||
digest: sha256:d8d285b3a54353a55240986bee90e651c60e505a4a743c9572d1b646c3e92ccc
|
||||
generated: "2021-02-09T14:33:16.291936+01:00"
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
name: traefik
|
||||
description: A Traefik based Kubernetes ingress controller
|
||||
type: application
|
||||
version: 0.1.2
|
||||
version: 0.2.0
|
||||
upstream_version: 9.14.2
|
||||
appVersion: 2.4.2
|
||||
keywords:
|
||||
|
@ -19,3 +19,7 @@ dependencies:
|
|||
- name: cert-manager
|
||||
repository: "https://charts.jetstack.io"
|
||||
version: v1.1.0
|
||||
- name: reflector
|
||||
repository: "https://emberstack.github.io/helm-charts"
|
||||
version: 5.4.17
|
||||
|
Binary file not shown.
|
@ -8,6 +8,8 @@ metadata:
|
|||
"helm.sh/hook": post-install,post-upgrade
|
||||
"helm.sh/hook-weight": "10"
|
||||
"helm.sh/hook-delete-policy": before-hook-creation
|
||||
reflector.v1.k8s.emberstack.com/secret-reflection-allowed: "true"
|
||||
reflector.v1.k8s.emberstack.com/secret-reflection-auto-enabled: "true"
|
||||
spec:
|
||||
commonName: {{ .Values.certmanager.wildcardDomain }}
|
||||
secretName: wildcardcert
|
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||
name: common
|
||||
description: Function library for TrueCharts
|
||||
type: library
|
||||
version: 0.11.1
|
||||
version: 0.11.2
|
||||
# upstream_version: 2.4.0
|
||||
keywords:
|
||||
- truecharts
|
||||
|
|
|
@ -41,16 +41,19 @@ spec:
|
|||
{{- end }}
|
||||
{{- if $values.certType }}
|
||||
tls:
|
||||
{{- if eq $values.certType "selfsigned" -}}{{ else if eq $values.certType "existingcert" }}
|
||||
secretName: {{ $values.existingcert }}
|
||||
{{ else if eq $values.certType "wildcard" }}
|
||||
secretName: wilddcardcert
|
||||
{{ else }}
|
||||
{{- if eq $values.certType "selfsigned" -}}{}{{ else }}
|
||||
- hosts:
|
||||
{{- range $values.hosts }}
|
||||
- {{ .host | quote }}
|
||||
{{- end }}
|
||||
{{- if eq $values.certType "selfsigned" -}}
|
||||
{{ else if eq $values.certType "existingcert" }}
|
||||
secretName: {{ $values.existingcert }}
|
||||
{{ else if eq $values.certType "wildcard" }}
|
||||
secretName: wildcardcert
|
||||
{{ else }}
|
||||
secretName: {{ $IngressName }}-tls-secret
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
{{- end }}
|
||||
rules:
|
||||
|
|
|
@ -40,19 +40,22 @@ spec:
|
|||
terminationDelay: 400
|
||||
{{- if $values.certType }}
|
||||
tls:
|
||||
{{- if eq $values.certType "selfsigned" -}}{{ else if eq $values.certType "existingcert" }}
|
||||
secretName: {{ $values.existingcert }}
|
||||
{{ else if eq $values.certType "wildcard" }}
|
||||
secretName: wilddcardcert
|
||||
{{ else }}
|
||||
secretName: {{ $IngressName }}-tls-secret
|
||||
{{- if eq $values.certType "selfsigned" -}}{}{{ else }}
|
||||
domains:
|
||||
- main: {{ index $values.hosts 0 }}
|
||||
sans:
|
||||
sans:
|
||||
{{- range $values.hosts }}
|
||||
- {{ .host | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if eq $values.certType "selfsigned" -}}
|
||||
{{ else if eq $values.certType "existingcert" }}
|
||||
secretName: {{ $values.existingcert }}
|
||||
{{ else if eq $values.certType "wildcard" }}
|
||||
secretName: wildcardcert
|
||||
{{ else }}
|
||||
secretName: {{ $IngressName }}-tls-secret
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
passthrough: false
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
Loading…
Reference in New Issue