Restructure ansible code

tasks/main.yml

@@ -1,6 +1,3 @@
-#- debug: var=my_context
-#  tags: traefik
-
 - name: traefik setup
   block:
   - name: namespace
@@ -15,7 +12,6 @@
           name: traefik
           labels:
             namespace: traefik
-    tags: traefik
 
   - name: Create a Secret object for basic authentification
     k8s:
@@ -32,7 +28,6 @@
           basic_auth: "{{ basic_auth_data | b64encode }}"
     when:
       - basic_auth == true
-    tags: traefik
 
   - name: Add host label for traefik deployment
     k8s:
@@ -49,7 +44,6 @@
       - '{{ traefik_node_selector }}'
     when:
       - traefik_node_selector is defined
-    tags: traefik
 
   - name: Get Deployment information object
     k8s_info:
@@ -63,20 +57,48 @@
     register: traefik_actual_resources
 
   - name: Retreive actual traefik version
-    shell: echo "{{ traefik_actual_resources.resources }}" | sed "s/.*traefik:\([.0-9]*\).*/\1/" | uniq
+    shell: echo "{{ traefik_actual_resources.resources }}" | sed "s/.*traefik:\([0-9]\.[0-9]*\).*/\1/" | uniq
     register: traefik_actual_version
 
-  - name: install / uninstall version 2.0
-    include_tasks: "version_2.0.yml"
+  - name: Remove old traefik version {{ traefik_actual_version.stdout }}
+    k8s:
+      state: "absent"
+      context: "{{ my_context }}"
+      resource_definition: "{{ lookup('template', item) | from_yaml }}"
+    with_items:
+      - "{{ lookup('vars', 'traefik_' + traefik_actual_version.stdout + '_list') | reverse | list}}"
+#      - hostvars[inventory_hostname]['traefik_' + traefik_actual_version.stdout + '_list'] | reverse
     when:
-      - traefik_version | regex_search('(^2.0)')
+      - not traefik_actual_version.stdout == "[]"
+      - not traefik_version == traefik_actual_version.stdout
 
-  - name: install / uninstall version 2.1
-    include_tasks: "version_2.1.yml"
-    when:
-      - traefik_version | regex_search('(^2.1)')
+  - name: Install traefik version {{ traefik_version }}
+    k8s:
+      state: "present"
+      context: "{{ my_context }}"
+      merge_type: merge
+      resource_definition: "{{ lookup('template', item) | from_yaml }}"
+    with_items:
+      - "{{ lookup('vars', 'traefik_' + traefik_version + '_list') }}"
 
-  - name: install / uninstall version 2.2
-    include_tasks: "version_2.2.yml"
+  - name: Define state of ipwhitelist middleware to present
+    set_fact:
+      traefik_ipwhitelist_state: present
     when:
-      - traefik_version | regex_search('(^2.2)') or traefik_actual_version.stdout | regex_search('(^2.)')
+      - traefik_version | regex_search('(^2.)')
+      - ingress_whitelist is defined
+  - name: Define state of ipwhitelist middleware to absent
+    set_fact:
+      traefik_ipwhitelist_state: absent
+    when:
+      - not ingress_whitelist is defined or traefik_ipwhitelist_state is not defined
+  - name: IP white list need to be {{ traefik_ipwhitelist_state }}
+    k8s:
+      state: "{{ traefik_ipwhitelist_state }}"
+      context: "{{ my_context }}"
+      merge_type: merge
+      resource_definition: "{{ lookup('template', item) | from_yaml }}"
+    with_items:
+      - traefik-middleware-ipwhitelist.yml.j2
+
+  tags: traefik