From 5c6ffc42c56e419b56e9859eab9cf904b13bad40 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 27 Jun 2021 08:44:39 +0200
Subject: [PATCH] Update and Fix Traefik

(cherry picked from commit ab76bbc21f4383590aad7ff8b5eeabeb969917b3)
---
 charts/stable/traefik/Chart.yaml             |   3 +-
 charts/stable/traefik/SCALE/questions.yaml   | 119 -------------------
 charts/stable/traefik/templates/service.yaml |   2 +
 3 files changed, 4 insertions(+), 120 deletions(-)

diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml
index 9f227396993..0acb11f6062 100644
--- a/charts/stable/traefik/Chart.yaml
+++ b/charts/stable/traefik/Chart.yaml
@@ -25,4 +25,5 @@ sources:
 - https://github.com/traefik/traefik-helm-chart
 - https://traefik.io/
 type: application
-version: 6.1.6
+version: 6.1.7
+upstream_version: "v9.19.2"
diff --git a/charts/stable/traefik/SCALE/questions.yaml b/charts/stable/traefik/SCALE/questions.yaml
index eac432f7a96..b90aec04449 100644
--- a/charts/stable/traefik/SCALE/questions.yaml
+++ b/charts/stable/traefik/SCALE/questions.yaml
@@ -174,125 +174,6 @@ questions:
                   default: "TCP"
                   hidden: true
 
-
-  - variable: persistence
-    label: "Integrated Persistent Storage"
-    group: "Storage and Persistence"
-    schema:
-      type: dict
-      attrs:
-        - variable: config
-          label: "App Config Storage"
-          description: "Stores the Application Configuration."
-          schema:
-            type: dict
-            attrs:
-              - variable: enabled
-                label: "Enable the storage"
-                schema:
-                  type: boolean
-                  default: true
-              - variable: type
-                label: "(Advanced) Type of Storage"
-                description: "Sets the persistence type"
-                schema:
-                  type: string
-                  default: "pvc"
-                  enum:
-                    - value: "pvc"
-                      description: "pvc"
-                    - value: "emptyDir"
-                      description: "emptyDir"
-                    - value: "hostPath"
-                      description: "hostPath"
-              - variable: storageClass
-                label: "(Advanced) storageClass"
-                description: " Warning: Anything other than SCALE-ZFS will break rollback!"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "SCALE-ZFS"
-              - variable: setPermissions
-                label: "Automatic Permissions"
-                description: "Automatically set permissions on install"
-                schema:
-                  show_if: [["type", "=", "hostPath"]]
-                  type: boolean
-                  default: true
-              - variable: readOnly
-                label: "readOnly"
-                schema:
-                  type: boolean
-                  default: false
-              - variable: hostPath
-                label: "hostPath"
-                description: "Path inside the container the storage is mounted"
-                schema:
-                  show_if: [["type", "=", "hostPath"]]
-                  type: hostpath
-              - variable: hostPathType
-                label: "hostPath Type"
-                schema:
-                  show_if: [["type", "=", "hostPath"]]
-                  type: string
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: "Default"
-                    - value: "DirectoryOrCreate"
-                      description: "DirectoryOrCreate"
-                    - value: "Directory"
-                      description: "Directory"
-                    - value: "FileOrCreate"
-                      description: "FileOrCreate"
-                    - value: "File"
-                      description: "File"
-                    - value: "Socket"
-                      description: "Socket"
-                    - value: "CharDevice"
-                      description: "CharDevice"
-                    - value: "BlockDevice"
-                      description: "BlockDevice"
-              - variable: mountPath
-                label: "mountPath"
-                description: "Path inside the container the storage is mounted"
-                schema:
-                  type: string
-                  default: "/data"
-                  hidden: true
-              - variable: medium
-                label: "EmptyDir Medium"
-                schema:
-                  show_if: [["type", "=", "emptyDir"]]
-                  type: string
-                  default: ""
-                  enum:
-                    - value: ""
-                      description: "Default"
-                    - value: "Memory"
-                      description: "Memory"
-              - variable: accessMode
-                label: "Access Mode (Advanced)"
-                description: "Allow or disallow multiple PVC's writhing to the same PV"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "ReadWriteOnce"
-                  enum:
-                    - value: "ReadWriteOnce"
-                      description: "ReadWriteOnce"
-                    - value: "ReadOnlyMany"
-                      description: "ReadOnlyMany"
-                    - value: "ReadWriteMany"
-                      description: "ReadWriteMany"
-              - variable: size
-                label: "Size quotum of storage"
-                schema:
-                  show_if: [["type", "=", "pvc"]]
-                  type: string
-                  default: "100Gi"
-
-
   - variable: securityContext
     group: "Security and Permissions"
     label: "Security Context"
diff --git a/charts/stable/traefik/templates/service.yaml b/charts/stable/traefik/templates/service.yaml
index aa9f418ae06..745bb9102d7 100644
--- a/charts/stable/traefik/templates/service.yaml
+++ b/charts/stable/traefik/templates/service.yaml
@@ -12,6 +12,8 @@
 
 apiVersion: v1
 kind: List
+metadata:
+  name: {{ template "traefik.fullname" . }}
 items:
 {{- if  $tcpPorts }}
   - apiVersion: v1