add roles/k3s-reset

playbook/jobs/init_k3s_cluster_apisix

@@ -4,11 +4,15 @@
   become: yes
   gather_facts: yes
   tasks:
+    - include_role:
+        name: k3s-reset
+      vars:
+        group: master
     - include_role:
         name: k3s
       vars:
         group: master
-        cni: default
+        cni: kubeovn
         ingress: apisix
         external_dns: enable
         version: 'v1.24.7+k3s1'
@@ -17,7 +21,6 @@
         svc_cidr: '172.16.0.0/16'
         cluster_dns: '172.16.0.10'
         cluster_domain: 'cluster.local'
-        cluster_reset: true
         join_cidr: '100.64.0.0/16'
         namespace: ingress
         domain: onwalk.net

playbook/jobs/init_k3s_cluster_artifact

@@ -17,7 +17,6 @@
         svc_cidr: '172.16.0.0/16'
         cluster_dns: '172.16.0.10'
         cluster_domain: 'cluster.local'
-        cluster_reset: false
         join_cidr: '100.64.0.0/16'
         cni_iface: 'eth0'
         cni_tunnel: 'geneve'

playbook/jobs/init_k3s_cluster_bookinfo

@@ -17,7 +17,6 @@
         svc_cidr: '172.16.0.0/16'
         cluster_dns: '172.16.0.10'
         cluster_domain: 'cluster.local'
-        cluster_reset: false
         join_cidr: '100.64.0.0/16'
         cni_iface: 'eth0'
         cni_tunnel: 'geneve'

playbook/roles/k3s-reset/tasks/main.yml

@@ -0,0 +1,4 @@
+- name: Reset K3S Cluster
+  script: files/reset-k3s.sh
+  when: inventory_hostname in groups[group]
+

playbook/roles/k3s/tasks/main.yml

@@ -1,8 +1,3 @@
-- name: Reset K3S Cluster
-  script: files/reset-k3s.sh
-  when: ( inventory_hostname in groups[group] ) and ( cluster_reset == true )
-  ignore_errors: yes
-
 - name: Setup K3S Server
   script: files/setup-k3s.sh {{ version }} {{ cluster_domain }} {{ cni }} {{ ingress }} {{ pod_cidr }} {{ svc_cidr }}
   when: inventory_hostname in groups[group]