diff --git a/defaults/main.yml b/defaults/main.yml index c73b43f..c392afd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,6 @@ my_context: kubernetes -traefik_version: "2.10.3" +traefik_version: "3.0.0" +traefik_helm_chart_version: "28.0.0" cluster_domain: "local" traefik_namespace: "traefik" traefik_service_type: LoadBalancer @@ -22,4 +23,4 @@ basic_auth: false # traefik_dashboard_certificate: wildcard-cluster crowdsec_namespace: "crowdsec" -crowdsec_traefik_bouncer_chart_version: "0.3.5" +crowdsec_traefik_bouncer_chart_version: "0.1.3" diff --git a/tasks/main.yml b/tasks/main.yml index 041291c..593e65a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -110,6 +110,7 @@ context: "{{ my_context }}" name: traefik chart_ref: traefik/traefik + chart_version: "{{ traefik_helm_chart_version }}" release_namespace: "{{ traefik_namespace }}" values: "{{ lookup('template', 'traefik-helm-value.yaml.j2') | from_yaml }}" diff --git a/templates/traefik-cm.yml.j2 b/templates/traefik-cm.yml.j2 index 289341c..746b1ab 100644 --- a/templates/traefik-cm.yml.j2 +++ b/templates/traefik-cm.yml.j2 @@ -25,8 +25,6 @@ data: to: websecure scheme: https permanent: true - # http3: - # advertisedPort: 42 websecure: address: ":8443" http: @@ -107,9 +105,9 @@ data: ## BackendName: keep ## BackendURL: keep ## FrontendName: keep +{% if traefik_hub_token is defined or traefik_ondemand is defined %} experimental: # kubernetesGateway: true - http3: true {% if traefik_hub_token is defined %} hub: true {% endif %} @@ -119,3 +117,4 @@ data: moduleName: github.com/acouvreur/traefik-ondemand-plugin version: v1.2.0 {% endif %} +{% endif %}