From 84e63c3af3eb0e5d018f0d35f7fab95c0865c9f9 Mon Sep 17 00:00:00 2001
From: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Date: Thu, 2 Nov 2023 23:07:38 +0200
Subject: [PATCH] bump traefik chart to v25.0.0

Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
---
 .../generated-changes/patch/Chart.yaml.patch   | 15 ---------------
 .../patch/templates/_helpers.tpl.patch         |  7 ++++---
 .../patch/templates/_podtemplate.tpl.patch     |  2 +-
 .../generated-changes/patch/values.yaml.patch  | 18 ++++++++++--------
 packages/traefik/package.yaml                  |  2 +-
 .../traefik/templates/crd-template/Chart.yaml  |  4 ++--
 6 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 packages/traefik/generated-changes/patch/Chart.yaml.patch

diff --git a/packages/traefik/generated-changes/patch/Chart.yaml.patch b/packages/traefik/generated-changes/patch/Chart.yaml.patch
deleted file mode 100644
index 70be769..0000000
--- a/packages/traefik/generated-changes/patch/Chart.yaml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- charts-original/Chart.yaml
-+++ charts/Chart.yaml
-@@ -1,10 +1,7 @@
- annotations:
--  artifacthub.io/changes: "- \"⬆️ Upgrade traefik Docker tag to v2.9.8\"\n- \"\U0001F6A8
--    Fail when enabling PSP on Kubernetes v1.25+ (#801)\"\n- \"Separate UDP hostPort
--    for HTTP/3\"\n- \"feat: Add volumeName to PersistentVolumeClaim (#792)\"\n- \"Allow
--    setting TLS options on dashboard IngressRoute\"\n"
-+  fleet.cattle.io/bundle-id: k3s
- apiVersion: v2
--appVersion: v2.9.8
-+appVersion: v2.9.10
- description: A Traefik based Kubernetes ingress controller
- home: https://traefik.io/
- icon: https://raw.githubusercontent.com/traefik/traefik/v2.3/docs/content/assets/img/traefik.logo.png
diff --git a/packages/traefik/generated-changes/patch/templates/_helpers.tpl.patch b/packages/traefik/generated-changes/patch/templates/_helpers.tpl.patch
index 53718ce..128b614 100644
--- a/packages/traefik/generated-changes/patch/templates/_helpers.tpl.patch
+++ b/packages/traefik/generated-changes/patch/templates/_helpers.tpl.patch
@@ -1,9 +1,9 @@
 --- charts-original/templates/_helpers.tpl
 +++ charts/templates/_helpers.tpl
-@@ -121,3 +121,11 @@
-     {{- tpl (.value | toYaml) .context }}
-   {{- end }}
+@@ -129,3 +129,11 @@
+ {{ (split "@" (default $.Chart.AppVersion $.Values.image.tag))._0 }}
  {{- end -}}
+ 
 +
 +{{- define "system_default_registry" -}}
 +{{- if .Values.global.systemDefaultRegistry -}}
@@ -12,3 +12,4 @@
 +{{- "" -}}
 +{{- end -}}
 +{{- end -}}
+\ No newline at end of file
diff --git a/packages/traefik/generated-changes/patch/templates/_podtemplate.tpl.patch b/packages/traefik/generated-changes/patch/templates/_podtemplate.tpl.patch
index 7aef9ac..25da5e8 100644
--- a/packages/traefik/generated-changes/patch/templates/_podtemplate.tpl.patch
+++ b/packages/traefik/generated-changes/patch/templates/_podtemplate.tpl.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/_podtemplate.tpl
 +++ charts/templates/_podtemplate.tpl
-@@ -35,7 +35,7 @@
+@@ -50,7 +50,7 @@
        shareProcessNamespace: true
        {{- end }}
        containers:
diff --git a/packages/traefik/generated-changes/patch/values.yaml.patch b/packages/traefik/generated-changes/patch/values.yaml.patch
index c23daa0..2975b2c 100644
--- a/packages/traefik/generated-changes/patch/values.yaml.patch
+++ b/packages/traefik/generated-changes/patch/values.yaml.patch
@@ -1,20 +1,22 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -1,8 +1,8 @@
- # Default values for Traefik
- image:
+@@ -3,9 +3,9 @@
+   # -- Traefik image host registry
+   registry: docker.io
+   # -- Traefik image repository
 -  repository: traefik
 +  repository: rancher/mirrored-library-traefik
-   # defaults to appVersion
+   # -- defaults to appVersion
 -  tag: ""
-+  tag: "2.9.10"
++  tag: "v2.10.5"
+   # -- Traefik image pull policy
    pullPolicy: IfNotPresent
  
+@@ -945,3 +945,7 @@
  #
-@@ -869,3 +869,6 @@
- #
- ## This will override the default app.kubernetes.io/instance label for all Objects.
+ ## -- This will override the default app.kubernetes.io/instance label for all Objects.
  # instanceLabelOverride: traefik
++
 +#
 +global:
 +  systemDefaultRegistry: ""
diff --git a/packages/traefik/package.yaml b/packages/traefik/package.yaml
index 037cd4c..2d2f30f 100644
--- a/packages/traefik/package.yaml
+++ b/packages/traefik/package.yaml
@@ -1,4 +1,4 @@
-url: https://traefik.github.io/charts/traefik/traefik-21.2.0.tgz
+url: https://traefik.github.io/charts/traefik/traefik-25.0.0.tgz
 packageVersion: 1
 additionalCharts:
   - workingDir: charts-crd
diff --git a/packages/traefik/templates/crd-template/Chart.yaml b/packages/traefik/templates/crd-template/Chart.yaml
index 1b25b1f..43b63ac 100644
--- a/packages/traefik/templates/crd-template/Chart.yaml
+++ b/packages/traefik/templates/crd-template/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 21.2.0
-appVersion: v2.9.10
+version: 25.0.0
+appVersion: v2.10.0
 description: Installs the CRDs for traefik
 name: traefik-crd
 type: application