diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml index cf6a4cd2638..a8369d4d228 100644 --- a/charts/stable/traefik/Chart.yaml +++ b/charts/stable/traefik/Chart.yaml @@ -22,4 +22,4 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 7.0.4 +version: 7.0.5 diff --git a/charts/stable/traefik/templates/_args.tpl b/charts/stable/traefik/templates/_args.tpl index 2ecdb60a1e6..41e7e44b8fd 100644 --- a/charts/stable/traefik/templates/_args.tpl +++ b/charts/stable/traefik/templates/_args.tpl @@ -48,7 +48,7 @@ args: {{- end }} {{- if .Values.providers.kubernetesIngress.enabled }} - "--providers.kubernetesingress" - {{- if and .Values.service.enabled .Values.providers.kubernetesIngress.publishedService.enabled }} + {{- if and .Values.providers.kubernetesIngress.publishedService.enabled }} - "--providers.kubernetesingress.ingressendpoint.publishedservice={{ template "providers.kubernetesIngress.publishedServicePath" . }}" {{- end }} {{- if .Values.providers.kubernetesIngress.labelSelector }} diff --git a/charts/stable/traefik/templates/_helpers.tpl b/charts/stable/traefik/templates/_helpers.tpl index 5abff4405b1..8c6c4ac96bc 100644 --- a/charts/stable/traefik/templates/_helpers.tpl +++ b/charts/stable/traefik/templates/_helpers.tpl @@ -5,7 +5,8 @@ service generated. Users can provide an override for an explicit service they want bound via `.Values.providers.kubernetesIngress.publishedService.pathOverride` */}} {{- define "providers.kubernetesIngress.publishedServicePath" -}} -{{- $defServiceName := printf "%s/%s-tcp" .Release.Namespace (include "traefik.fullname" .) -}} +{{- $fullName := include "common.names.fullname" . -}} +{{- $defServiceName := printf "%s/%s-tcp" .Release.Namespace $fullName -}} {{- $servicePath := default $defServiceName .Values.providers.kubernetesIngress.publishedService.pathOverride }} {{- print $servicePath | trimSuffix "-" -}} {{- end -}}