diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index 294c5aabeea..b09192e6b17 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 17.0.10 +version: 17.0.11 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/traefik/questions.yaml b/charts/enterprise/traefik/questions.yaml index 2e9cb339b4e..c7a053be6fa 100644 --- a/charts/enterprise/traefik/questions.yaml +++ b/charts/enterprise/traefik/questions.yaml @@ -1,13 +1,8 @@ # Include{groups} portals: open: - protocols: - - "http" - host: - - "$kubernetes-resource_configmap_portal_host" - ports: - - "$kubernetes-resource_configmap_portal_port" - path: "/dashboard/" +# Include{portalLink} + path: "$kubernetes-resource_configmap_tcportal-open_path" questions: # Include{global} # Include{workload} diff --git a/charts/enterprise/traefik/templates/common.yaml b/charts/enterprise/traefik/templates/common.yaml index 7833892df08..d70a9887a47 100644 --- a/charts/enterprise/traefik/templates/common.yaml +++ b/charts/enterprise/traefik/templates/common.yaml @@ -1,7 +1,6 @@ {{/* Make sure all variables are set properly */}} {{- include "tc.v1.common.loader.init" . }} - {{- $newArgs := (include "traefik.args" . | fromYaml) }} {{- $_ := set .Values "newArgs" $newArgs -}} {{- $mergedargs := concat $.Values.workload.main.podSpec.containers.main.args .Values.newArgs.args }} @@ -12,6 +11,13 @@ {{- include "traefik.ingressRoute" . }} {{- include "traefik.ingressClass" . }} +{{- with .Values.ingress -}} + {{- with .main -}} + {{- if .enabled -}} + {{- $_ := set $.Values.portal.open.override "protocol" "https" -}} + {{- end -}} + {{- end -}} +{{- end -}} {{/* Render the templates */}} {{ include "tc.v1.common.loader.apply" . }} diff --git a/charts/enterprise/traefik/values.yaml b/charts/enterprise/traefik/values.yaml index 56d75a4389a..da317fc579c 100644 --- a/charts/enterprise/traefik/values.yaml +++ b/charts/enterprise/traefik/values.yaml @@ -414,3 +414,6 @@ persistence: portal: open: enabled: true + path: /dashboard/ + override: + protocol: http