diff --git a/charts/traefik/0.1.2/Chart.lock b/charts/traefik/0.1.2/Chart.lock deleted file mode 100644 index 3f084b4f405..00000000000 --- a/charts/traefik/0.1.2/Chart.lock +++ /dev/null @@ -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" diff --git a/charts/traefik/0.1.2/.helmignore b/charts/traefik/0.2.0/.helmignore similarity index 100% rename from charts/traefik/0.1.2/.helmignore rename to charts/traefik/0.2.0/.helmignore diff --git a/charts/traefik/0.2.0/Chart.lock b/charts/traefik/0.2.0/Chart.lock new file mode 100644 index 00000000000..32dc98bfbec --- /dev/null +++ b/charts/traefik/0.2.0/Chart.lock @@ -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" diff --git a/charts/traefik/0.1.2/Chart.yaml b/charts/traefik/0.2.0/Chart.yaml similarity index 82% rename from charts/traefik/0.1.2/Chart.yaml rename to charts/traefik/0.2.0/Chart.yaml index 76589a1b56d..7e64f418598 100644 --- a/charts/traefik/0.1.2/Chart.yaml +++ b/charts/traefik/0.2.0/Chart.yaml @@ -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 + diff --git a/charts/traefik/0.1.2/Guidelines.md b/charts/traefik/0.2.0/Guidelines.md similarity index 100% rename from charts/traefik/0.1.2/Guidelines.md rename to charts/traefik/0.2.0/Guidelines.md diff --git a/charts/traefik/0.1.2/LICENSE b/charts/traefik/0.2.0/LICENSE similarity index 100% rename from charts/traefik/0.1.2/LICENSE rename to charts/traefik/0.2.0/LICENSE diff --git a/charts/traefik/0.1.2/README.md b/charts/traefik/0.2.0/README.md similarity index 100% rename from charts/traefik/0.1.2/README.md rename to charts/traefik/0.2.0/README.md diff --git a/charts/traefik/0.1.2/app-readme.md b/charts/traefik/0.2.0/app-readme.md similarity index 100% rename from charts/traefik/0.1.2/app-readme.md rename to charts/traefik/0.2.0/app-readme.md diff --git a/charts/traefik/0.1.2/charts/cert-manager-v1.1.0.tgz b/charts/traefik/0.2.0/charts/cert-manager-v1.1.0.tgz similarity index 100% rename from charts/traefik/0.1.2/charts/cert-manager-v1.1.0.tgz rename to charts/traefik/0.2.0/charts/cert-manager-v1.1.0.tgz diff --git a/charts/traefik/0.2.0/charts/reflector-5.4.17.tgz b/charts/traefik/0.2.0/charts/reflector-5.4.17.tgz new file mode 100644 index 00000000000..20850c0504b Binary files /dev/null and b/charts/traefik/0.2.0/charts/reflector-5.4.17.tgz differ diff --git a/charts/traefik/0.1.2/crds/ingressroute.yaml b/charts/traefik/0.2.0/crds/ingressroute.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/ingressroute.yaml rename to charts/traefik/0.2.0/crds/ingressroute.yaml diff --git a/charts/traefik/0.1.2/crds/ingressroutetcp.yaml b/charts/traefik/0.2.0/crds/ingressroutetcp.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/ingressroutetcp.yaml rename to charts/traefik/0.2.0/crds/ingressroutetcp.yaml diff --git a/charts/traefik/0.1.2/crds/ingressrouteudp.yaml b/charts/traefik/0.2.0/crds/ingressrouteudp.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/ingressrouteudp.yaml rename to charts/traefik/0.2.0/crds/ingressrouteudp.yaml diff --git a/charts/traefik/0.1.2/crds/middlewares.yaml b/charts/traefik/0.2.0/crds/middlewares.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/middlewares.yaml rename to charts/traefik/0.2.0/crds/middlewares.yaml diff --git a/charts/traefik/0.1.2/crds/serverstransports.yaml b/charts/traefik/0.2.0/crds/serverstransports.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/serverstransports.yaml rename to charts/traefik/0.2.0/crds/serverstransports.yaml diff --git a/charts/traefik/0.1.2/crds/tlsoptions.yaml b/charts/traefik/0.2.0/crds/tlsoptions.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/tlsoptions.yaml rename to charts/traefik/0.2.0/crds/tlsoptions.yaml diff --git a/charts/traefik/0.1.2/crds/tlsstores.yaml b/charts/traefik/0.2.0/crds/tlsstores.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/tlsstores.yaml rename to charts/traefik/0.2.0/crds/tlsstores.yaml diff --git a/charts/traefik/0.1.2/crds/traefikservices.yaml b/charts/traefik/0.2.0/crds/traefikservices.yaml similarity index 100% rename from charts/traefik/0.1.2/crds/traefikservices.yaml rename to charts/traefik/0.2.0/crds/traefikservices.yaml diff --git a/charts/traefik/0.1.2/questions.yaml b/charts/traefik/0.2.0/questions.yaml similarity index 100% rename from charts/traefik/0.1.2/questions.yaml rename to charts/traefik/0.2.0/questions.yaml diff --git a/charts/traefik/0.1.2/templates/_helpers.tpl b/charts/traefik/0.2.0/templates/_helpers.tpl similarity index 100% rename from charts/traefik/0.1.2/templates/_helpers.tpl rename to charts/traefik/0.2.0/templates/_helpers.tpl diff --git a/charts/traefik/0.1.2/templates/_podtemplate.tpl b/charts/traefik/0.2.0/templates/_podtemplate.tpl similarity index 100% rename from charts/traefik/0.1.2/templates/_podtemplate.tpl rename to charts/traefik/0.2.0/templates/_podtemplate.tpl diff --git a/charts/traefik/0.1.2/templates/custom/_appStorage.tpl b/charts/traefik/0.2.0/templates/custom/_appStorage.tpl similarity index 100% rename from charts/traefik/0.1.2/templates/custom/_appStorage.tpl rename to charts/traefik/0.2.0/templates/custom/_appStorage.tpl diff --git a/charts/traefik/0.1.2/templates/custom/appingress.yaml b/charts/traefik/0.2.0/templates/custom/appingress.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/custom/appingress.yaml rename to charts/traefik/0.2.0/templates/custom/appingress.yaml diff --git a/charts/traefik/0.1.2/templates/custom/clusterissuer.yaml b/charts/traefik/0.2.0/templates/custom/clusterissuer.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/custom/clusterissuer.yaml rename to charts/traefik/0.2.0/templates/custom/clusterissuer.yaml diff --git a/charts/traefik/0.1.2/templates/custom/delay_postinstall.yaml b/charts/traefik/0.2.0/templates/custom/delay_postinstall.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/custom/delay_postinstall.yaml rename to charts/traefik/0.2.0/templates/custom/delay_postinstall.yaml diff --git a/charts/traefik/0.1.2/templates/custom/middlewares.yaml b/charts/traefik/0.2.0/templates/custom/middlewares.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/custom/middlewares.yaml rename to charts/traefik/0.2.0/templates/custom/middlewares.yaml diff --git a/charts/traefik/0.1.2/templates/custom/tlsoptions.yaml b/charts/traefik/0.2.0/templates/custom/tlsoptions.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/custom/tlsoptions.yaml rename to charts/traefik/0.2.0/templates/custom/tlsoptions.yaml diff --git a/charts/traefik/0.1.2/templates/custom/wildcard.yaml b/charts/traefik/0.2.0/templates/custom/wildcard.yaml similarity index 80% rename from charts/traefik/0.1.2/templates/custom/wildcard.yaml rename to charts/traefik/0.2.0/templates/custom/wildcard.yaml index df35e4a18de..c3b441a18a9 100644 --- a/charts/traefik/0.1.2/templates/custom/wildcard.yaml +++ b/charts/traefik/0.2.0/templates/custom/wildcard.yaml @@ -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 diff --git a/charts/traefik/0.1.2/templates/daemonset.yaml b/charts/traefik/0.2.0/templates/daemonset.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/daemonset.yaml rename to charts/traefik/0.2.0/templates/daemonset.yaml diff --git a/charts/traefik/0.1.2/templates/dashboard-hook-ingressroute.yaml b/charts/traefik/0.2.0/templates/dashboard-hook-ingressroute.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/dashboard-hook-ingressroute.yaml rename to charts/traefik/0.2.0/templates/dashboard-hook-ingressroute.yaml diff --git a/charts/traefik/0.1.2/templates/deployment.yaml b/charts/traefik/0.2.0/templates/deployment.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/deployment.yaml rename to charts/traefik/0.2.0/templates/deployment.yaml diff --git a/charts/traefik/0.1.2/templates/gateway.yaml b/charts/traefik/0.2.0/templates/gateway.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/gateway.yaml rename to charts/traefik/0.2.0/templates/gateway.yaml diff --git a/charts/traefik/0.1.2/templates/gatewayclass.yaml b/charts/traefik/0.2.0/templates/gatewayclass.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/gatewayclass.yaml rename to charts/traefik/0.2.0/templates/gatewayclass.yaml diff --git a/charts/traefik/0.1.2/templates/hpa.yaml b/charts/traefik/0.2.0/templates/hpa.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/hpa.yaml rename to charts/traefik/0.2.0/templates/hpa.yaml diff --git a/charts/traefik/0.1.2/templates/ingressclass.yaml b/charts/traefik/0.2.0/templates/ingressclass.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/ingressclass.yaml rename to charts/traefik/0.2.0/templates/ingressclass.yaml diff --git a/charts/traefik/0.1.2/templates/poddisruptionbudget.yaml b/charts/traefik/0.2.0/templates/poddisruptionbudget.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/poddisruptionbudget.yaml rename to charts/traefik/0.2.0/templates/poddisruptionbudget.yaml diff --git a/charts/traefik/0.1.2/templates/pvc.yaml b/charts/traefik/0.2.0/templates/pvc.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/pvc.yaml rename to charts/traefik/0.2.0/templates/pvc.yaml diff --git a/charts/traefik/0.1.2/templates/rbac/clusterrole.yaml b/charts/traefik/0.2.0/templates/rbac/clusterrole.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/rbac/clusterrole.yaml rename to charts/traefik/0.2.0/templates/rbac/clusterrole.yaml diff --git a/charts/traefik/0.1.2/templates/rbac/clusterrolebinding.yaml b/charts/traefik/0.2.0/templates/rbac/clusterrolebinding.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/rbac/clusterrolebinding.yaml rename to charts/traefik/0.2.0/templates/rbac/clusterrolebinding.yaml diff --git a/charts/traefik/0.1.2/templates/rbac/podsecuritypolicy.yaml b/charts/traefik/0.2.0/templates/rbac/podsecuritypolicy.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/rbac/podsecuritypolicy.yaml rename to charts/traefik/0.2.0/templates/rbac/podsecuritypolicy.yaml diff --git a/charts/traefik/0.1.2/templates/rbac/role.yaml b/charts/traefik/0.2.0/templates/rbac/role.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/rbac/role.yaml rename to charts/traefik/0.2.0/templates/rbac/role.yaml diff --git a/charts/traefik/0.1.2/templates/rbac/rolebinding.yaml b/charts/traefik/0.2.0/templates/rbac/rolebinding.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/rbac/rolebinding.yaml rename to charts/traefik/0.2.0/templates/rbac/rolebinding.yaml diff --git a/charts/traefik/0.1.2/templates/rbac/serviceaccount.yaml b/charts/traefik/0.2.0/templates/rbac/serviceaccount.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/rbac/serviceaccount.yaml rename to charts/traefik/0.2.0/templates/rbac/serviceaccount.yaml diff --git a/charts/traefik/0.1.2/templates/service.yaml b/charts/traefik/0.2.0/templates/service.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/service.yaml rename to charts/traefik/0.2.0/templates/service.yaml diff --git a/charts/traefik/0.1.2/templates/tlsoption.yaml b/charts/traefik/0.2.0/templates/tlsoption.yaml similarity index 100% rename from charts/traefik/0.1.2/templates/tlsoption.yaml rename to charts/traefik/0.2.0/templates/tlsoption.yaml diff --git a/charts/traefik/0.1.2/test_values.yaml b/charts/traefik/0.2.0/test_values.yaml similarity index 100% rename from charts/traefik/0.1.2/test_values.yaml rename to charts/traefik/0.2.0/test_values.yaml diff --git a/charts/traefik/0.1.2/values.yaml b/charts/traefik/0.2.0/values.yaml similarity index 100% rename from charts/traefik/0.1.2/values.yaml rename to charts/traefik/0.2.0/values.yaml diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 0796106d720..5ff09c712dc 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -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 diff --git a/library/common/templates/custom/classes/_appIngressHTTP.tpl b/library/common/templates/custom/classes/_appIngressHTTP.tpl index 900adde3289..150e88060c3 100644 --- a/library/common/templates/custom/classes/_appIngressHTTP.tpl +++ b/library/common/templates/custom/classes/_appIngressHTTP.tpl @@ -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: diff --git a/library/common/templates/custom/classes/_appIngressTCP.tpl b/library/common/templates/custom/classes/_appIngressTCP.tpl index 34e072d1077..319f6d3f411 100644 --- a/library/common/templates/custom/classes/_appIngressTCP.tpl +++ b/library/common/templates/custom/classes/_appIngressTCP.tpl @@ -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 }}