From d99b5686b5c20a37390de979c945b201053f7b03 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Fri, 1 Nov 2024 15:24:24 +0100
Subject: [PATCH] Update traefik helm chart to version 33.0.0

---
 defaults/main.yml                    |  2 +-
 tasks/main.yml                       | 13 +++++++++++++
 templates/traefik-cm.yml.j2          |  3 ++-
 templates/traefik-helm-value.yaml.j2 | 20 ++++++++++++++++++--
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index caa315f..144a988 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
 my_context: kubernetes
 traefik_version: "3.2.0"
-traefik_helm_chart_version: "32.1.1"
+traefik_helm_chart_version: "33.0.0"
 cluster_domain: "local"
 traefik_namespace: "traefik"
 traefik_service_type: LoadBalancer
diff --git a/tasks/main.yml b/tasks/main.yml
index 07f176b..46cad8c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,18 @@
 - name: traefik setup
   block:
+    - name: Deploy Traefik CRDs
+      kubernetes.core.k8s:
+        state: present
+        context: "{{ my_context }}"
+        apply: true
+        definition: "{{ lookup('url', item , split_lines=False) | from_yaml_all }}"
+      with_items:
+#        - "https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.0/standard-install.yaml"
+        - "https://raw.githubusercontent.com/traefik/traefik/v3.2/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml"
+#        - "https://raw.githubusercontent.com/traefik/traefik/v3.2/docs/content/reference/dynamic-configuration/kubernetes-crd-rbac.yml"
+#      ansible.builtin.command: >
+#        kubectl --context "{{ my_context }}" apply --server-side --force-conflicts -k
+#        https://github.com/traefik/traefik-helm-chart/tree/v{{ traefik_helm_chart_version }}/traefik/crds/
     - name: namespace
       kubernetes.core.k8s:
         state: present
diff --git a/templates/traefik-cm.yml.j2 b/templates/traefik-cm.yml.j2
index 5c2a44c..7a58e79 100644
--- a/templates/traefik-cm.yml.j2
+++ b/templates/traefik-cm.yml.j2
@@ -37,7 +37,7 @@ data:
         http3:
           advertisedPort: 443
       traefik:
-        address: ":9000/tcp"
+        address: ":8080/tcp"
       metrics:
         address: ":9100/tcp"
 {% if traefik_hub_token is defined %}
@@ -81,6 +81,7 @@ data:
 {% if traefik_ondemand is defined %}
         allowEmptyServices: true
 {% endif%}
+      kubernetesGateway: {}
       file:
         directory: /etc/traefik/file/
         watch: true
diff --git a/templates/traefik-helm-value.yaml.j2 b/templates/traefik-helm-value.yaml.j2
index e2ab99d..0294e1a 100644
--- a/templates/traefik-helm-value.yaml.j2
+++ b/templates/traefik-helm-value.yaml.j2
@@ -148,8 +148,6 @@ experimental:
       moduleName: "github.com/sablierapp/sablier"
       version: "v1.8.1"
 {% endif %}
-  kubernetesGateway:
-    enabled: false
 {% if traefik_hub_token is defined %}
   hub:
     enabled: true
@@ -161,3 +159,21 @@ securityContext:
   readOnlyRootFilesystem: true
   seccompProfile: 
     type: RuntimeDefault
+{% if false %}
+{% raw %}
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "extra"
+    data:
+      something: "extra"
+  - |
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "templated"
+    data:
+      something: {{ printf "templated" }}
+{% endraw %}
+{% endif %}