From fe44d97ed74d30f66266601d4c5ce62b1f9b8133 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien.reslinger@flaminem.com>
Date: Thu, 12 Dec 2019 11:11:33 +0100
Subject: [PATCH] Fix for traefik 2.x

---
 tasks/main.yml                  | 6 +++---
 templates/weave_ingress.yaml.j2 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 3d04ada..d4c5ddc 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -26,7 +26,7 @@
           basic_auth: "{{ basic_auth_data | b64encode }}"
     when:
       - basic_auth == true
-      - traefik_version is not defined or traefik_version == "1.7"
+      - traefik_version is not defined or traefik_version | regex_search('(1.)')
     tags: weave
 
   - name: Remove a Secret object for basic authentification (traefik 1.7)
@@ -44,7 +44,7 @@
           basic_auth: "{{ basic_auth_data | b64encode }}"
     when:
       - traefik_version is defined
-      - traefik_version != "1.7"
+      - traefik_version | regex_search('(2.)')
     tags: weave
 
   - name: Remove old existing Ingress object
@@ -57,7 +57,7 @@
       name: weave
     when:
       - traefik_version is defined
-      - traefik_version != "1.7"
+      - traefik_version | regex_search('(2.)')
 
 # file found https://github.com/weaveworks/scope/tree/master/examples/k8s/
   - name: Weave Scope files
diff --git a/templates/weave_ingress.yaml.j2 b/templates/weave_ingress.yaml.j2
index 6916e68..6e30c3e 100644
--- a/templates/weave_ingress.yaml.j2
+++ b/templates/weave_ingress.yaml.j2
@@ -25,7 +25,7 @@ spec:
           serviceName: weave-scope-app
           servicePort: 80
 {% else %}
-{% if traefik_version == "2.0" %}
+{% if traefik_version | regex_search('(2.)') %}
 apiVersion: traefik.containo.us/v1alpha1
 kind: IngressRoute
 metadata: