From 983726c530655bedcf0511ae57b0aee999bcb03b Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Fri, 26 May 2023 10:32:55 +0300 Subject: [PATCH] fix(traefik): fix context on middlewares (#9174) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #9170 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [x] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/enterprise/traefik/Chart.yaml | 2 +- .../traefik/templates/middlewares/addPrefix.yaml | 2 +- .../templates/middlewares/basic-middleware.yaml | 14 +++++++------- .../traefik/templates/middlewares/basicauth.yaml | 2 +- .../traefik/templates/middlewares/chain.yaml | 2 +- .../templates/middlewares/forwardauth.yaml | 2 +- .../traefik/templates/middlewares/geoblock.yaml | 2 +- .../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 | 16 ++++++++-------- .../templates/middlewares/tc-headers.yaml | 4 ++-- .../templates/middlewares/tc-nextcloud.yaml | 6 +++--- .../templates/middlewares/theme-park.yaml | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index 696b88735a3..701f5394d29 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.3 +version: 18.0.4 annotations: truecharts.org/catagories: | - network diff --git a/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml b/charts/enterprise/traefik/templates/middlewares/addPrefix.yaml index 3b010c207f6..473f703eec9 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} 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 dedc490442f..ead5bdf724e 100644 --- a/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml +++ b/charts/enterprise/traefik/templates/middlewares/basic-middleware.yaml @@ -3,7 +3,7 @@ apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-compress" .Release.Name) "compress" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-compress" $.Release.Name) "compress" $.Values.ingressClass.enabled }} namespace: tc-system spec: compress: {} @@ -13,7 +13,7 @@ spec: apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-basic-ratelimit" .Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-basic-ratelimit" $.Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }} namespace: tc-system spec: rateLimit: @@ -23,7 +23,7 @@ spec: apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-basic-secure-headers" .Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-basic-secure-headers" $.Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }} namespace: tc-system spec: headers: @@ -48,11 +48,11 @@ spec: apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-chain-basic" .Release.Name) "chain-basic" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-chain-basic" $.Release.Name) "chain-basic" $.Values.ingressClass.enabled }} namespace: tc-system spec: chain: middlewares: - - name: {{ ternary (printf "%v-basic-ratelimit" .Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }} - - name: {{ ternary (printf "%v-basic-secure-headers" .Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }} - - name: {{ ternary (printf "%v-compress" .Release.Name) "compress" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-basic-ratelimit" $.Release.Name) "basic-ratelimit" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-basic-secure-headers" $.Release.Name) "basic-secure-headers" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-compress" $.Release.Name) "compress" $.Values.ingressClass.enabled }} diff --git a/charts/enterprise/traefik/templates/middlewares/basicauth.yaml b/charts/enterprise/traefik/templates/middlewares/basicauth.yaml index c4bf7575c18..f2a990a57e0 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: basicAuth: diff --git a/charts/enterprise/traefik/templates/middlewares/chain.yaml b/charts/enterprise/traefik/templates/middlewares/chain.yaml index 14a1bee7eec..bb4920caab7 100644 --- a/charts/enterprise/traefik/templates/middlewares/chain.yaml +++ b/charts/enterprise/traefik/templates/middlewares/chain.yaml @@ -10,7 +10,7 @@ apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: chain: diff --git a/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml b/charts/enterprise/traefik/templates/middlewares/forwardauth.yaml index 62efb45da10..a0336c6719d 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: forwardAuth: diff --git a/charts/enterprise/traefik/templates/middlewares/geoblock.yaml b/charts/enterprise/traefik/templates/middlewares/geoblock.yaml index 0cefca3ee76..c1a2dcd0aeb 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: plugin: diff --git a/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml b/charts/enterprise/traefik/templates/middlewares/ipwhitelist.yaml index 2d643596094..cec46d5102a 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: ipWhiteList: diff --git a/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml b/charts/enterprise/traefik/templates/middlewares/ratelimit.yaml index e1d5f80cb20..a2ae79af66e 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} 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 badb3d66ece..1e7d6e148e0 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: plugin: diff --git a/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml b/charts/enterprise/traefik/templates/middlewares/redirectScheme.yaml index 4d4a029fe86..0913fd132a5 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: redirectScheme: diff --git a/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml b/charts/enterprise/traefik/templates/middlewares/redirectregex.yaml index 665fbf54c11..9dbd602a166 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: redirectRegex: diff --git a/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml b/charts/enterprise/traefik/templates/middlewares/stripPrefixRegex.yaml index 91a3702c5eb..a409bfa85a1 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} 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 eab9c0ad33c..0b21a01f3bc 100644 --- a/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml +++ b/charts/enterprise/traefik/templates/middlewares/tc-chains.yaml @@ -4,23 +4,23 @@ apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-%v" .Release.Name "tc-opencors-chain") "tc-opencors-chain" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-chain") "tc-opencors-chain" $.Values.ingressClass.enabled }} namespace: tc-system spec: chain: middlewares: - - name: {{ ternary (printf "%v-%v" .Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }} - - name: {{ ternary (printf "%v-%v" .Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }} - - name: {{ ternary (printf "%v-%v" .Release.Name "compress") "compress" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "compress") "compress" $.Values.ingressClass.enabled }} --- apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-%v" .Release.Name "tc-closedcors-chain") "tc-closedcors-chain" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-chain") "tc-closedcors-chain" $.Values.ingressClass.enabled }} namespace: tc-system spec: chain: middlewares: - - name: {{ ternary (printf "%v-%v" .Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }} - - name: {{ ternary (printf "%v-%v" .Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }} - - name: {{ ternary (printf "%v-%v" .Release.Name "compress") "compress" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "basic-ratelimit") "basic-ratelimit" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "compress") "compress" $.Values.ingressClass.enabled }} diff --git a/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml b/charts/enterprise/traefik/templates/middlewares/tc-headers.yaml index 92795070f7f..859a5c8e043 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: {{ ternary (printf "%v-%v" .Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name "tc-opencors-headers") "tc-opencors-headers" $.Values.ingressClass.enabled }} namespace: tc-system spec: headers: @@ -34,7 +34,7 @@ spec: apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-%v" .Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name "tc-closedcors-headers") "tc-closedcors-headers" $.Values.ingressClass.enabled }} 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 991a4344a4f..3186bf4e2ca 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: {{ ternary (printf "%v-%v" .Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }} namespace: tc-system spec: redirectRegex: @@ -14,9 +14,9 @@ spec: apiVersion: traefik.io/v1alpha1 kind: Middleware metadata: - name: {{ ternary (printf "%v-%v" .Release.Name "tc-nextcloud-chain") "tc-nextcloud-chain" $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-chain") "tc-nextcloud-chain" $.Values.ingressClass.enabled }} namespace: tc-system spec: chain: middlewares: - - name: {{ ternary (printf "%v-%v" .Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }} + - name: {{ ternary (printf "%v-%v" $.Release.Name "tc-nextcloud-redirectregex-dav") "tc-nextcloud-redirectregex-dav" $.Values.ingressClass.enabled }} diff --git a/charts/enterprise/traefik/templates/middlewares/theme-park.yaml b/charts/enterprise/traefik/templates/middlewares/theme-park.yaml index 7be7ecfe84d..5f6c9d8159e 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: {{ ternary (printf "%v-%v" .Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} + name: {{ ternary (printf "%v-%v" $.Release.Name $middlewareData.name) $middlewareData.name $.Values.ingressClass.enabled }} namespace: tc-system spec: plugin: