From f509df9ea47aef6006e3068ba6cbb5251efc4c01 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Sat, 29 Jul 2023 23:03:37 +0300
Subject: [PATCH] chore(traefik): use baked in plugins (#10997)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 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?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 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
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ 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 +-
 charts/enterprise/traefik/templates/_args.tpl | 19 ++++++++++++-------
 charts/enterprise/traefik/values.yaml         |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml
index f108e884dbf..4093e4f4d91 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: 19.0.1
+version: 19.0.2
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/enterprise/traefik/templates/_args.tpl b/charts/enterprise/traefik/templates/_args.tpl
index 4478375d842..12b73e8bcd5 100644
--- a/charts/enterprise/traefik/templates/_args.tpl
+++ b/charts/enterprise/traefik/templates/_args.tpl
@@ -156,22 +156,27 @@ args:
   {{- end }}
   {{- end }}
   {{- end }}
-  {{/* theme.park */}}
+  {{/*
+    For new plugins, add them on the container also
+    https://github.com/truecharts/containers/blob/master/mirror/traefik/Dockerfile
+    moduleName must match on the container and here
+  */}}
   {{- if .Values.middlewares.themePark }}
-  - "--experimental.plugins.traefik-themepark.modulename=github.com/packruler/traefik-themepark"
-  - "--experimental.plugins.traefik-themepark.version={{ .Values.middlewares.themeParkVersion }}"
+  {{/* theme.park */}}
+  - "--experimental.localPlugins.traefik-themepark.modulename=github.com/packruler/traefik-themepark"
+  - "--experimental.localPlugins.traefik-themepark.version={{ .Values.middlewares.themeParkVersion }}"
   {{- end }}
   {{/* End of theme.park */}}
   {{/* GeoBlock */}}
   {{- if .Values.middlewares.geoBlock }}
-  - "--experimental.plugins.GeoBlock.modulename=github.com/PascalMinder/geoblock"
-  - "--experimental.plugins.GeoBlock.version={{ .Values.middlewares.geoBlockVersion }}"
+  - "--experimental.localPlugins.GeoBlock.modulename=github.com/PascalMinder/geoblock"
+  - "--experimental.localPlugins.GeoBlock.version={{ .Values.middlewares.geoBlockVersion }}"
   {{- end }}
   {{/* End of GeoBlock */}}
   {{/* RealIP */}}
   {{- if .Values.middlewares.realIP }}
-  - "--experimental.plugins.traefik-real-ip.modulename=github.com/soulbalz/traefik-real-ip"
-  - "--experimental.plugins.traefik-real-ip.version={{ .Values.middlewares.realIPVersion }}"
+  - "--experimental.localPlugins.traefik-real-ip.modulename=github.com/soulbalz/traefik-real-ip"
+  - "--experimental.localPlugins.traefik-real-ip.version={{ .Values.middlewares.realIPVersion }}"
   {{- end }}
   {{/* End of RealIP */}}
   {{- with .Values.additionalArguments }}
diff --git a/charts/enterprise/traefik/values.yaml b/charts/enterprise/traefik/values.yaml
index be9ab2af58e..aaef9998a1b 100644
--- a/charts/enterprise/traefik/values.yaml
+++ b/charts/enterprise/traefik/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: tccr.io/truecharts/traefik
-  tag: 2.10.1@sha256:049aece2d3e7eddabed1e2e4c4bd03ceba372d3b9f461386b262b6cb69369fcf
+  tag: 2.10.4@sha256:028687caa7680c6189c52a6dd28ffd17c3d0a747885ad83b3027fa74023a0fec
   pullPolicy: IfNotPresent
 manifestManager:
   enabled: true
@@ -23,7 +23,7 @@ workload:
               # @default -- "/"
               # path: "/ping"
 
-            # -- Redainess probe configuration
+            # -- Readiness probe configuration
             # @default -- See below
             readiness:
               # -- sets the probe type when not using a custom probe