From e10bb28442e73247161ad0443a0194aab8142c32 Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Sat, 23 Jul 2022 01:24:37 +0200
Subject: [PATCH] Fix lint errors

---
 defaults/main.yml |  12 ++---
 meta/main.yml     |   6 +--
 tasks/main.yml    | 128 +++++++++++++++++++++++-----------------------
 3 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e87aeba..d37f256 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,12 +1,12 @@
 my_context: kubernetes
 ingress_domain: "local.cluster"
-#ingress_whitelist:
-#  - 10.96.0.0/12
-#  - 10.244.0.0/16
-#  - 192.168.140.0/24
+# ingress_whitelist:
+#   - 10.96.0.0/12
+#   - 10.244.0.0/16
+#   - 192.168.140.0/24
 basic_auth: false
-#traefik_version: "2.0"
-#traefik_namespace: traefik
+# traefik_version: "2.0"
+# traefik_namespace: traefik
 weave_net_password: "SuperMotDePasseDeLaMortQuiTue4012!"
 
 weave_scope: false
diff --git a/meta/main.yml b/meta/main.yml
index 3d95fcd..1a29953 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -6,6 +6,6 @@ galaxy_info:
   galaxy_tags: []
   license: GPL2
   platforms:
-  - name: kubernetes
-    version:
-    - all
+    - name: kubernetes
+      version:
+        - all
diff --git a/tasks/main.yml b/tasks/main.yml
index a30c524..78406f2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,9 +2,9 @@
 - name: Weave Net setup
   block:
     - name: Include Weave Net vars
-      include_vars: net-files.yaml
+      ansible.builtin.include_vars: net-files.yaml
     - name: Weave Net files
-      k8s:
+      kubernetes.core.k8s:
         state: present
         context: "{{ my_context }}"
         merge_type: merge
@@ -12,7 +12,7 @@
       with_items:
         - "{{ weave_net_files }}"
     - name: Weave Net password
-      k8s:
+      kubernetes.core.k8s:
         state: present
         context: "{{ my_context }}"
         merge_type: merge
@@ -28,72 +28,72 @@
 
 - name: Weave Scope setup
   block:
-  - name: namespace
-    k8s:
-      context: "{{ my_context }}"
-      state: present
-      name: weave
-      api_version: v1
-      kind: Namespace
+    - name: namespace
+      kubernetes.core.k8s:
+        context: "{{ my_context }}"
+        state: present
+        name: weave
+        api_version: v1
+        kind: Namespace
 
-  - name: Create a Secret object for basic authentification (traefik 1.7)
-    k8s:
-      state: present
-      context: "{{ my_context }}"
-      definition:
-        apiVersion: v1
-        kind: Secret
-        metadata:
-          name: basic-auth
-          namespace: weave
-        type: Opaque
-        data:
-          basic_auth: "{{ basic_auth_data | b64encode }}"
-    when:
-      - basic_auth|bool
-      - traefik_version is not defined or traefik_version | regex_search('(^1.)')
+    - name: Create a Secret object for basic authentification (traefik 1.7)
+      kubernetes.core.k8s:
+        state: present
+        context: "{{ my_context }}"
+        definition:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: basic-auth
+            namespace: weave
+          type: Opaque
+          data:
+            basic_auth: "{{ basic_auth_data | b64encode }}"
+      when:
+        - basic_auth|bool
+        - traefik_version is not defined or traefik_version | regex_search('(^1.)')
 
-  - name: Remove a Secret object for basic authentification (traefik 1.7)
-    k8s:
-      state: absent
-      context: "{{ my_context }}"
-      definition:
-        apiVersion: v1
-        kind: Secret
-        metadata:
-          name: basic-auth
-          namespace: weave
-        type: Opaque
-        data:
-          basic_auth: "{{ basic_auth_data | b64encode }}"
-    when:
-      - traefik_version is defined
-      - traefik_version | regex_search('(^2.)')
+    - name: Remove a Secret object for basic authentification (traefik 1.7)
+      kubernetes.core.k8s:
+        state: absent
+        context: "{{ my_context }}"
+        definition:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: basic-auth
+            namespace: weave
+          type: Opaque
+          data:
+            basic_auth: "{{ basic_auth_data | b64encode }}"
+      when:
+        - traefik_version is defined
+        - traefik_version | regex_search('(^2.)')
 
-  - name: Remove old existing Ingress object
-    k8s:
-      context: "{{ my_context }}"
-      state: absent
-      api_version: extensions/v1beta1
-      kind: Ingress
-      namespace: weave
-      name: weave
-    when:
-      - traefik_version is defined
-      - traefik_version | regex_search('(^2.)')
+    - name: Remove old existing Ingress object
+      kubernetes.core.k8s:
+        context: "{{ my_context }}"
+        state: absent
+        api_version: extensions/v1beta1
+        kind: Ingress
+        namespace: weave
+        name: weave
+      when:
+        - traefik_version is defined
+        - traefik_version | regex_search('(^2.)')
 
 # file found https://github.com/weaveworks/scope/tree/master/examples/k8s/
-  - name: Weave Scope files
-    k8s:
-      state: "present"
-      context: "{{ my_context }}"
-      namespace: 'weave'
-      merge_type: merge
-      definition: "{{ item }}"
-    with_items: "{{ lookup('url', 'https://cloud.weave.works/k8s/' + weave_scope_version + '/scope.yaml', split_lines=False) | from_yaml_all | list }}"
-    when:
-    - weave_scope|bool
-    - item is not none
+    - name: Weave Scope files
+      kubernetes.core.k8s:
+        state: "present"
+        context: "{{ my_context }}"
+        namespace: 'weave'
+        merge_type: merge
+        definition: "{{ item }}"
+      with_items: "{{ lookup('url', 'https://cloud.weave.works/k8s/' + weave_scope_version + '/scope.yaml', split_lines=False) | from_yaml_all | list }}"
+      when:
+      - weave_scope|bool
+      - item is not none
   tags:
     - weave
     - weave-scope