add roles/k3s-addon

playbook/jobs/init_k3s_cluster_apisix

@@ -10,11 +10,7 @@
         group: master
     - include_role:
         name: k3s
-      vars:
-        group: master
         cni: kubeovn
-        ingress: apisix
-        external_dns: enable
         version: 'v1.24.7+k3s1'
         pod_cidr: '10.10.0.0/16'
         pod_gateway: '10.10.0.1'
@@ -22,8 +18,16 @@
         cluster_dns: '172.16.0.10'
         cluster_domain: 'cluster.local'
         join_cidr: '100.64.0.0/16'
-        namespace: ingress
+      vars:
+        group: master
+    - include_role:
+        name: k3s-addon
+      vars:
+        group: master
+        ingress: apisix
+        external_dns: enable
         domain: onwalk.net
+        namespace: ingress
         auto_issuance: true
         update_secret: true
         tls:

playbook/roles/k3s-addon/meta/main.yml

@@ -0,0 +1,3 @@
+dependencies:
+  - role: cert-manager
+  - role: secret-manger

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

@@ -0,0 +1,11 @@
+- name: Setup K3S Ingress
+  script: files/setup-ingress.sh {{ ingress }} {{ ingress_ip }}
+  when: inventory_hostname in groups[group]
+
+- name: Setup DNS Provider
+  script: files/setup-dns-provider.sh {{ dns_ak }}  {{ dns_sk }}
+  when: ( inventory_hostname in groups[group] ) and (external_dns == 'enable' )
+- name: Remove DNS Provider
+  shell: 'helm delete external-dns  -n external-dns'
+  when: ( inventory_hostname in groups[group] ) and (external_dns == 'disable' )
+  ignore_errors: yes

playbook/roles/k3s/meta/main.yml

@@ -1,4 +1,2 @@
 dependencies:
   - role: common
-  - role: cert-manager
-  - role: secret-manger

playbook/roles/k3s/tasks/main.yml

@@ -2,18 +2,6 @@
   script: files/setup-k3s.sh {{ version }} {{ cluster_domain }} {{ cni }} {{ ingress }} {{ pod_cidr }} {{ svc_cidr }}
   when: inventory_hostname in groups[group]
 
-- name: Setup K3S Ingress
-  script: files/setup-ingress.sh {{ ingress }} {{ ingress_ip }}
-  when: inventory_hostname in groups[group]
-
-- name: Setup DNS Provider
-  script: files/setup-dns-provider.sh {{ dns_ak }}  {{ dns_sk }}
-  when: ( inventory_hostname in groups[group] ) and (external_dns == 'enable' )
-- name: Remove DNS Provider
-  shell: 'helm delete external-dns  -n external-dns'
-  when: ( inventory_hostname in groups[group] ) and (external_dns == 'disable' )
-  ignore_errors: yes
-
 - name: Sync K3S CNI Config
   template: src=templates/cni_install.sh dest=/tmp/ owner=root group=root mode=0644
   when: ( inventory_hostname in groups[group] ) and (cni == 'kubeovn' )
@@ -21,8 +9,3 @@
   shell: 'bash /tmp/cni_install.sh'
   when: ( inventory_hostname in groups[group] ) and (cni == 'kubeovn' )
   ignore_errors: yes
-
-
-#- name: Setup Egress
-#  script: files/setup-egress.sh {{ egress_ip }} {{ namespace }}
-#  when: inventory_hostname in groups[group]