From 5e066134b7d18aff983dff1d7e87f5747496381c Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Wed, 30 Jun 2021 17:19:32 +0200
Subject: [PATCH] Default websecure entrypoint and default enable tls on
 websecure entrypoint

---
 charts/library/common/Chart.yaml                     |  2 +-
 charts/library/common/templates/classes/_ingress.tpl |  1 +
 charts/stable/traefik/Chart.yaml                     |  2 +-
 charts/stable/traefik/SCALE/questions.yaml           | 12 ++++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 30fe10436cf..94145033534 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -18,4 +18,4 @@ maintainers:
 name: common
 sources:
 type: library
-version: 6.4.2
+version: 6.4.3
diff --git a/charts/library/common/templates/classes/_ingress.tpl b/charts/library/common/templates/classes/_ingress.tpl
index 7afa32182c9..d99f269e397 100644
--- a/charts/library/common/templates/classes/_ingress.tpl
+++ b/charts/library/common/templates/classes/_ingress.tpl
@@ -58,6 +58,7 @@ metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
   annotations:
+    "traefik.ingress.kubernetes.io/router.entrypoints": {{ $values.entrypoint | default "websecure" }}
     "traefik.ingress.kubernetes.io/router.middlewares": {{ $middlewares | quote }}
   {{- with $values.annotations }}
     {{- toYaml . | nindent 4 }}
diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml
index e11aa1bf532..b07fda27d70 100644
--- a/charts/stable/traefik/Chart.yaml
+++ b/charts/stable/traefik/Chart.yaml
@@ -26,4 +26,4 @@ sources:
 - https://traefik.io/
 type: application
 upstream_version: v9.19.2
-version: 6.3.3
+version: 6.3.4
diff --git a/charts/stable/traefik/SCALE/questions.yaml b/charts/stable/traefik/SCALE/questions.yaml
index e6f4512bb78..91f0f8e372e 100644
--- a/charts/stable/traefik/SCALE/questions.yaml
+++ b/charts/stable/traefik/SCALE/questions.yaml
@@ -283,6 +283,18 @@ questions:
                   required: true
                   default: "TCP"
                   hidden: true
+              - variable: tls
+                label: "tls"
+                schema:
+                  type: dict
+                  hidden: true
+                  attrs:
+                    - variable: enabled
+                      label: "enabled"
+                      schema:
+                        type: boolean
+                        default: true
+                        hidden: true
 
   - variable: securityContext
     group: "Security and Permissions"