From 3c28264fec95f9c15dc1340fd718df3ccfab019d Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Sun, 28 May 2023 19:33:44 +0800
Subject: [PATCH] .github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml:
 update

---
 ...setup-kube-ovn-demo-with-existed-vhost.yml | 46 ++++---------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml b/.github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml
index 99f9f65e..b1055143 100644
--- a/.github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml
+++ b/.github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml
@@ -93,18 +93,20 @@ jobs:
           ansible_ssh_private_key_file=~/.ssh/id_rsa
           ansible_host_key_checking=False
           admin_password=$ADMIN_INIT_PASSWORD
+          dns_ak=$DNS_AK
+          dns_sk=$DNS_SK
+          ingress_ip=165.154.130.48
           EOF
-          ansible-playbook -i hosts/inventory jobs/init_keycloak -D
-  Setup-Harbor:
+          ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D
+  Setup-APP-for-K3S:
     runs-on: ubuntu-latest
     needs:
       - setup-k3s
-      - setup-keycloak
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup Habor in K3S
+      - name: Setup APP for K3S
         shell: bash
         run: |
           export ANSIBLE_HOST_KEY_CHECKING=False
@@ -127,43 +129,13 @@ jobs:
           ansible_ssh_user=ubuntu
           ansible_ssh_private_key_file=~/.ssh/id_rsa
           ansible_host_key_checking=False
+          dns_ak=$DNS_AK
+          dns_sk=$DNS_SK
           ali_ak=$ALI_AK
           ali_sk=$ALI_SK
           harbor_admin_password=$ADMIN_INIT_PASSWORD
           harbor_odic_client_token=$HARBOR_OIDC_CLIENT_TOKEN
           EOF
           ansible-playbook -i hosts/inventory jobs/init_harbor -D
-  Setup-ChatWithGPT:
-    runs-on: ubuntu-latest
-    needs:
-      - setup-k3s
-      - setup-keycloak
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup GhatWithGPT in K3S
-        shell: bash
-        run: |
-          export ANSIBLE_HOST_KEY_CHECKING=False
-          sudo apt install jq ansible -y
-
-          mkdir -pv ~/.ssh/
-          cat > ~/.ssh/id_rsa << EOF
-          ${SSH_PRIVATE_KEY}
-          EOF
-          sudo chmod 0400 ~/.ssh/id_rsa
-          md5sum ~/.ssh/id_rsa
-
-          mkdir -pv hosts/ 
-          cat > hosts/inventory << EOF
-          [master]
-          vpn.onwalk.net               ansible_host=165.154.130.48
-          
-          [all:vars]
-          ansible_port=22
-          ansible_ssh_user=ubuntu
-          ansible_ssh_private_key_file=~/.ssh/id_rsa
-          ansible_host_key_checking=False
-          EOF
+          ansible-playbook -i hosts/inventory jobs/init_keycloak -D
           ansible-playbook -i hosts/inventory jobs/init_chatwithgpt -D