From 2a2161a25d060ec920a73e970656d63de893428d Mon Sep 17 00:00:00 2001 From: Adrien Reslinger Date: Wed, 7 Dec 2022 11:24:40 +0100 Subject: [PATCH] Update traefik deployment --- defaults/main.yml | 4 ++-- templates/traefik-cm.yml.j2 | 2 +- templates/traefik-helm-value.yaml.j2 | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 54f314c..64f9d0a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ my_context: kubernetes -traefik_version: "2.9.1" +traefik_version: "2.9.5" cluster_domain: "local" traefik_namespace: "traefik" traefik_service_type: LoadBalancer @@ -22,4 +22,4 @@ basic_auth: false # traefik_dashboard_certificate: wildcard-cluster crowdsec_namespace: "crowdsec" -crowdsec_traefik_bouncer_chart_version: "0.1.2" +crowdsec_traefik_bouncer_chart_version: "0.3.5" diff --git a/templates/traefik-cm.yml.j2 b/templates/traefik-cm.yml.j2 index 7adfb58..ec15dcc 100644 --- a/templates/traefik-cm.yml.j2 +++ b/templates/traefik-cm.yml.j2 @@ -37,7 +37,7 @@ data: # - secure_headers@file # - crowdsec-bouncer@file # http3: - # advertisedPort: 42 + # advertisedPort: 443 traefik: address: ":9000/tcp" metrics: diff --git a/templates/traefik-helm-value.yaml.j2 b/templates/traefik-helm-value.yaml.j2 index 050187b..0abb7fd 100644 --- a/templates/traefik-helm-value.yaml.j2 +++ b/templates/traefik-helm-value.yaml.j2 @@ -1,6 +1,8 @@ # https://github.com/traefik/traefik-helm-chart/blob/master/traefik/values.yaml -#image: -# tag: "{{ traefik_version }}" +{% if traefik_version is defined %} +image: + tag: "{{ traefik_version }}" +{% endif %} #fullnameOverride: "{{ my_context }}" additionalArguments: - --configFile=/etc/traefik/traefik.yaml @@ -23,6 +25,7 @@ podDisruptionBudget: ingressClass: enabled: true isDefaultClass: true +{% if false %} autoscaling: enabled: true minReplicas: 1 @@ -36,6 +39,7 @@ autoscaling: resource: name: memory targetAverageUtilization: 60 +{% endif %} {% if traefik_service_type == "NodePort" or traefik_hub_token is defined %} ports: {% if traefik_service_type == "NodePort" and false %}