From 023e095d78a36ab799362219e90daa1b235c27b5 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Wed, 24 May 2023 11:36:22 +0200
Subject: [PATCH] fix(traefik): ensure ingressclass state is fetched from
 global scope

---
 charts/enterprise/traefik/Chart.yaml               |  2 +-
 charts/enterprise/traefik/templates/_args.tpl      |  2 +-
 .../enterprise/traefik/templates/_ingressclass.tpl |  2 +-
 .../enterprise/traefik/templates/_portalhook.tpl   |  2 +-
 .../traefik/templates/middlewares/addPrefix.yaml   |  2 +-
 .../templates/middlewares/basic-middleware.yaml    | 14 +++++++-------
 .../traefik/templates/middlewares/basicauth.yaml   |  2 +-
 .../traefik/templates/middlewares/chain.yaml       |  4 ++--
 .../traefik/templates/middlewares/forwardauth.yaml |  2 +-
 .../traefik/templates/middlewares/geoblock.yaml    |  2 +-
 .../traefik/templates/middlewares/ipwhitelist.yaml |  2 +-
 .../traefik/templates/middlewares/ratelimit.yaml   |  2 +-
 .../traefik/templates/middlewares/real-ip.yaml     |  2 +-
 .../templates/middlewares/redirectScheme.yaml      |  2 +-
 .../templates/middlewares/redirectregex.yaml       |  2 +-
 .../templates/middlewares/stripPrefixRegex.yaml    |  2 +-
 .../traefik/templates/middlewares/tc-chains.yaml   | 14 +++++++-------
 .../traefik/templates/middlewares/tc-headers.yaml  |  4 ++--
 .../templates/middlewares/tc-nextcloud.yaml        |  6 +++---
 .../traefik/templates/middlewares/theme-park.yaml  |  2 +-
 20 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml
index a73f0861d6d..7acbf70cd49 100644
--- a/charts/enterprise/traefik/Chart.yaml
+++ b/charts/enterprise/traefik/Chart.yaml
@@ -23,7 +23,7 @@ sources:
   - https://github.com/traefik/traefik-helm-chart
   - https://traefik.io/
 type: application
-version: 18.0.0
+version: 18.0.1
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/enterprise/traefik/templates/_args.tpl b/charts/enterprise/traefik/templates/_args.tpl
index cf1e35a1d49..4478375d842 100644
--- a/charts/enterprise/traefik/templates/_args.tpl
+++ b/charts/enterprise/traefik/templates/_args.tpl
@@ -67,7 +67,7 @@ args:
   - "--providers.kubernetesingress.namespaces={{ template "providers.kubernetesIngress.namespaces" . }}"
   {{- end }}
   {{- end }}
-  {{- if .Values.ingressClass.enabled }}
+  {{- if $.Values.ingressClass.enabled }}
   - "--providers.kubernetesingress.ingressclass={{ .Release.Name }}"
   {{- end }}
   {{- range $entrypoint, $config := $ports }}
diff --git a/charts/enterprise/traefik/templates/_ingressclass.tpl b/charts/enterprise/traefik/templates/_ingressclass.tpl
index 004d4a6dcda..4213783865c 100644
--- a/charts/enterprise/traefik/templates/_ingressclass.tpl
+++ b/charts/enterprise/traefik/templates/_ingressclass.tpl
@@ -1,7 +1,7 @@
 {{/* Define the ingressClass */}}
 {{- define "traefik.ingressClass" -}}
 ---
-{{ if .Values.ingressClass.enabled }}
+{{ if $.Values.ingressClass.enabled }}
   {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/IngressClass" }}
 apiVersion: networking.k8s.io/v1
   {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/IngressClass" }}
diff --git a/charts/enterprise/traefik/templates/_portalhook.tpl b/charts/enterprise/traefik/templates/_portalhook.tpl
index 8ea309653b9..d6f939e9fdd 100644
--- a/charts/enterprise/traefik/templates/_portalhook.tpl
+++ b/charts/enterprise/traefik/templates/_portalhook.tpl
@@ -6,7 +6,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: portalhook{{ if .Values.ingressClass.enabled }}-{{ .Release.Name }}{{ end }}
+  name: portalhook{{ if $.Values.ingressClass.enabled }}-{{ .Release.Name }}{{ end }}
   namespace: tc-system
 data:
   {{- $ports := dict }}
diff --git a/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml b/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
index 0ad0df5937f..0bf3774872a 100644
--- a/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   addPrefix:
diff --git a/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml b/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
index becb701a7a9..d531e76e469 100644
--- a/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
   namespace: tc-system
 spec:
   compress: {}
@@ -14,7 +14,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
   namespace: tc-system
 spec:
   rateLimit:
@@ -24,7 +24,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
   namespace: tc-system
 spec:
   headers:
@@ -49,11 +49,11 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}chain-basic
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}chain-basic
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-secure-headers
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
diff --git a/charts/enterprise/traefik/templates/middlewares/basicauth.yaml b/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
index 88ed8f67d4b..8f23b4276e4 100644
--- a/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/basicauth.yaml
@@ -23,7 +23,7 @@ stringData:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   basicAuth:
diff --git a/charts/enterprise/traefik/templates/middlewares/chain.yaml b/charts/enterprise/traefik/templates/middlewares/chain.yaml
index 8f5096ebca1..67dc06fe38b 100644
--- a/charts/enterprise/traefik/templates/middlewares/chain.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/chain.yaml
@@ -1,6 +1,6 @@
 {{- $values := .Values }}
 {{- $namespace := "tc-system" }}
-{{- if .Values.ingressClass.enabled }}
+{{- if $.Values.ingressClass.enabled }}
 {{- $namespace := ( printf "tc-system-%s" .Release.Name ) }}
 {{- end }}
 {{ range $index, $middlewareData := .Values.middlewares.chain }}
@@ -10,7 +10,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   chain:
diff --git a/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml b/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
index 133165d030e..e51a88874d4 100644
--- a/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml
@@ -5,7 +5,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   forwardAuth:
diff --git a/charts/enterprise/traefik/templates/middlewares/geoblock.yaml b/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
index 37ed116e091..e5a9630161b 100644
--- a/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/geoblock.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   plugin:
diff --git a/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml b/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
index 0b396aaf8f3..fd0a4e33a56 100644
--- a/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   ipWhiteList:
diff --git a/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml b/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
index 314ec64894c..ab27923d0ee 100644
--- a/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   rateLimit:
diff --git a/charts/enterprise/traefik/templates/middlewares/real-ip.yaml b/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
index 3e2fb6795c7..0b21cce1bf8 100644
--- a/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/real-ip.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   plugin:
diff --git a/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml b/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
index c427de152f1..3140bd39f78 100644
--- a/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   redirectScheme:
diff --git a/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml b/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
index 339b2090a09..4ecb9baf8e8 100644
--- a/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml
@@ -7,7 +7,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   redirectRegex:
diff --git a/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml b/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
index 331b7c59f2a..ff3d979559d 100644
--- a/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   stripPrefixRegex:
diff --git a/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml b/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
index 4a497cb2a5c..286fcc2d4b1 100644
--- a/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml
@@ -4,14 +4,14 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-chain
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-chain
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
@@ -21,6 +21,6 @@ metadata:
 spec:
   chain:
     middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}basic-ratelimit
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}compress
diff --git a/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml b/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
index 45015e6a640..6f37e0c5792 100644
--- a/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-opencors-headers
   namespace: tc-system
 spec:
   headers:
@@ -34,7 +34,7 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-closedcors-headers
   namespace: tc-system
 spec:
   headers:
diff --git a/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml b/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
index 413994b0fa2..778a6da9cbf 100644
--- a/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/tc-nextcloud.yaml
@@ -4,7 +4,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
   namespace: tc-system
 spec:
   redirectRegex:
@@ -14,9 +14,9 @@ spec:
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-chain
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-chain
   namespace: tc-system
 spec:
   chain:
     middlewares:
-    - name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
+    - name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}tc-nextcloud-redirectregex-dav
diff --git a/charts/enterprise/traefik/templates/middlewares/theme-park.yaml b/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
index 7bd52abb940..bf0c78b4208 100644
--- a/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
+++ b/charts/enterprise/traefik/templates/middlewares/theme-park.yaml
@@ -6,7 +6,7 @@
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
-  name: {{ if .Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
+  name: {{ if $.Values.ingressClass.enabled }}{{ .Release.Name }}-{{ end }}{{ $middlewareData.name }}
   namespace: tc-system
 spec:
   plugin: