From a9faf1337c6b680c6ddadc6bc7da26dd1a7e272a Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Mon, 13 Jul 2020 15:38:46 +0200
Subject: [PATCH] More cleaner vars names

---
 tasks/main.yml              | 4 ++--
 templates/traefik-dp.yml.j2 | 4 ++--
 vars/main.yml               | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index a6708ad..3630314 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -66,7 +66,7 @@
       context: "{{ my_context }}"
       resource_definition: "{{ lookup('template', item) | from_yaml }}"
     with_items:
-      - "{{ lookup('vars', 'traefik_' + traefik_actual_version.stdout + '_list') | reverse | list }}"
+      - "{{ lookup('vars', 'traefik_' + traefik_actual_version.stdout | regex_replace('[.]','_') + '_list') | reverse | list }}"
 #      - hostvars[inventory_hostname]['traefik_' + traefik_actual_version.stdout + '_list'] | reverse
     when:
       - not traefik_actual_version.stdout == "[]"
@@ -80,7 +80,7 @@
       merge_type: merge
       resource_definition: "{{ lookup('template', item) | from_yaml }}"
     with_items:
-      - "{{ lookup('vars', 'traefik_' + traefik_version + '_list') }}"
+      - "{{ lookup('vars', 'traefik_' + traefik_version | regex_replace('[.]','_') + '_list') }}"
       - traefik-cm.yml.j2
       - traefik-sa.yml.j2
       - traefik-dp.yml.j2
diff --git a/templates/traefik-dp.yml.j2 b/templates/traefik-dp.yml.j2
index 9cdec37..d3155ae 100644
--- a/templates/traefik-dp.yml.j2
+++ b/templates/traefik-dp.yml.j2
@@ -21,7 +21,7 @@ spec:
       serviceAccountName: traefik-ingress-controller
       containers:
         - name: traefik
-          image: traefik:{{ lookup('vars', 'traefik_version_' + traefik_version | regex_replace('\.','_') ) }}
+          image: traefik:{{ lookup('vars', 'traefik_version_' + traefik_version | regex_replace('\.','_')) }}
           args:
             - --configfile=/config/traefik.yaml
 #          imagePullPolicy: IfNotPresent
@@ -68,7 +68,7 @@ spec:
               name: config
 {% if traefik_node_selector is defined %}
       nodeSelector:
-        flaminem.com/entrypoint: traefik
+        reslinger.net/entrypoint: traefik
 {% endif %}
       dnsPolicy: ClusterFirst
 {% if my_context == "flamykube" %}
diff --git a/vars/main.yml b/vars/main.yml
index 6a88e79..7bc5986 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,5 +1,5 @@
 traefik_version_2_0: 2.0.7
-traefik_2.0_list:
+traefik_2_0_list:
   - 2.0/traefik-clusterrole.yml.j2
   - 2.0/traefik-clusterrolebinding.yml.j2
   - 2.0/traefik-crd-ingressroute.yml.j2
@@ -8,7 +8,7 @@ traefik_2.0_list:
   - 2.0/traefik-crd-tlsoption.yml.j2
 
 traefik_version_2_1: 2.1.9
-traefik_2.1_list:
+traefik_2_1_list:
   - 2.1/traefik-clusterrole.yml.j2
   - 2.1/traefik-clusterrolebinding.yml.j2
   - 2.1/traefik-crd-ingressroute.yml.j2
@@ -18,7 +18,7 @@ traefik_2.1_list:
   - 2.1/traefik-crd-traefikservice.yml.j2
 
 traefik_version_2_2: 2.2.4
-traefik_2.2_list:
+traefik_2_2_list:
   - 2.2/traefik-crd-ingressroutes.yml.j2
   - 2.2/traefik-crd-ingressroutetcps.yml.j2
   - 2.2/traefik-crd-ingressrouteudps.yml.j2