From 076be7e396e8ed18fc9977c732fefb88d997ed03 Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Thu, 21 Dec 2023 08:51:51 +0800
Subject: [PATCH] Merged: init_k3s_cluster_with_gitops -> init_k3s_cluster_std

---
 .github/workflows/use-setup-k3s-cluster.yml |  2 +-
 playbook/init_k3s_cluster_std               | 10 +++----
 playbook/init_k3s_cluster_with_gitops       | 31 ---------------------
 3 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 playbook/init_k3s_cluster_with_gitops

diff --git a/.github/workflows/use-setup-k3s-cluster.yml b/.github/workflows/use-setup-k3s-cluster.yml
index b30145c2..d778c483 100644
--- a/.github/workflows/use-setup-k3s-cluster.yml
+++ b/.github/workflows/use-setup-k3s-cluster.yml
@@ -71,5 +71,5 @@ jobs:
         shell: bash
         run: |
           export ANSIBLE_HOST_KEY_CHECKING=False
-          ansible-playbook -i hosts/inventory init_k3s_cluster_with_gitops -e "cluster_name=${{inputs.ssh_host_name}}" -e "domain=${{inputs.domain}}" -D
+          ansible-playbook -i hosts/inventory init_k3s_cluster_std -e "cluster_name=${{inputs.ssh_host_name}}" -e "domain=${{inputs.domain}}" -D
         working-directory: playbook/ 
diff --git a/playbook/init_k3s_cluster_std b/playbook/init_k3s_cluster_std
index 973fb3ae..7a4bf253 100644
--- a/playbook/init_k3s_cluster_std
+++ b/playbook/init_k3s_cluster_std
@@ -21,12 +21,12 @@
         name: k3s-addon
       vars:
         group: master
-        gitops: enable
-        config_repo: https://github.com/svc-design/gitops.git
         ingress: nginx
-        domain: svc.plus
-        namespace: ingress
+        gitops: enable
+        canary: enable
         auto_issuance: true
-        update_secret: false
         external_dns: enable
+        external_dns: enable
+        update_secret: false
         svc_discovery: disable
+        config_repo: https://github.com/svc-design/gitops.git
diff --git a/playbook/init_k3s_cluster_with_gitops b/playbook/init_k3s_cluster_with_gitops
deleted file mode 100644
index fbc4df23..00000000
--- a/playbook/init_k3s_cluster_with_gitops
+++ /dev/null
@@ -1,31 +0,0 @@
-- name: set artifact cluster with vhosts
-  hosts: all
-  user: root
-  become: yes
-  gather_facts: yes
-  tasks:
-    - include_role:
-        name: k3s-reset
-      vars:
-        group: master
-        cluster_reset: 'enable'
-    - include_role:
-        name: k3s
-      vars:
-        group: master
-        cni: default
-        version: 'v1.27.2+k3s1'
-        pod_cidr: '10.10.0.0/16'
-        svc_cidr: '172.16.0.0/16'
-    - include_role:
-        name: k3s-addon
-      vars:
-        group: master
-        gitops: enable
-        canary: enable
-        auto_issuance: true
-        external_dns: enable
-        update_secret: false
-        external_dns: enable
-        svc_discovery: disable
-        config_repo: https://github.com/svc-design/gitops.git