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 d6dafe69..6bd97574 100644 --- a/.github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml +++ b/.github/workflows/setup-kube-ovn-demo-with-existed-vhost.yml @@ -61,7 +61,45 @@ jobs: dns_sk=$DNS_SK ingress_ip=34.92.35.136 EOF - ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D + ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D -C + Setup-Bookinfo-for-GCP-K3S: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Setup APP for 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] + artifact ansible_host=34.92.35.136 + + [all:vars] + ansible_port=22 + ansible_ssh_user=root + 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 + admin_password=$ADMIN_INIT_PASSWORD + harbor_odic_client_token=$HARBOR_OIDC_CLIENT_TOKEN + EOF + ansible-playbook -i hosts/inventory jobs/init_datadog_agent -D + ansible-playbook -i hosts/inventory jobs/init_bookinfo -D Setup-APP-for-GCP-K3S: runs-on: ubuntu-latest needs: @@ -105,5 +143,3 @@ jobs: ansible-playbook -i hosts/inventory jobs/init_nginx_oss -D ansible-playbook -i hosts/inventory jobs/init_chatwithgpt -D ansible-playbook -i hosts/inventory jobs/init_observability-agent -D - ansible-playbook -i hosts/inventory jobs/init_datadog_agent -D - ansible-playbook -i hosts/inventory jobs/init_bookinfo -D diff --git a/playbook/roles/wireguard-dateway/templates/config.json b/playbook/roles/wireguard-dateway/templates/config.json deleted file mode 100644 index 494ffc26..00000000 --- a/playbook/roles/wireguard-dateway/templates/config.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "log": { - "loglevel": "warning" - }, - "routing": { - "domainStrategy": "IPIfNonMatch", - "rules": [ - { - "type": "field", - "ip": [ - "geoip:cn" - ], - "outboundTag": "block" - } - ] - }, - "inbounds": [ - { - "listen": "0.0.0.0", - "port": 1443, - "protocol": "vless", - "settings": { - "clients": [ - { - "id": "18d270a9-533d-4b13-b3f1-e7f55540a9b2", - "flow": "xtls-rprx-vision" - } - ], - "decryption": "none", - "fallbacks": [ - { - "dest": "8001", - "xver": 1 - }, - { - "alpn": "h2", - "dest": "8002", - "xver": 1 - } - ] - }, - "streamSettings": { - "network": "tcp", - "security": "tls", - "tlsSettings": { - "rejectUnknownSni": true, - "minVersion": "1.2", - "certificates": [ - { - "ocspStapling": 3600, - "certificateFile": "/etc/ssl/onwalk.net.pem", - "keyFile": "/etc/ssl/onwalk.net.key" - } - ] - } - }, - "sniffing": { - "enabled": true, - "destOverride": [ - "http", - "tls" - ] - } - } - ], - "outbounds": [ - { - "protocol": "freedom", - "tag": "direct" - }, - { - "protocol": "blackhole", - "tag": "block" - } - ], - "policy": { - "levels": { - "0": { - "handshake": 2, - "connIdle": 120 - } - } - } -}