diff --git a/.github/workflows/setup-api-gateway-with-existed-vhost.yml b/.github/workflows/setup-api-gateway-with-existed-vhost.yml index afb6e5dc..1ab47d3e 100644 --- a/.github/workflows/setup-api-gateway-with-existed-vhost.yml +++ b/.github/workflows/setup-api-gateway-with-existed-vhost.yml @@ -46,7 +46,7 @@ jobs: [all:vars] ansible_port=22 - ansible_ssh_user=root + ansible_ssh_user=shenlan ansible_ssh_private_key_file=~/.ssh/id_rsa ansible_host_key_checking=False dns_ak=$DNS_AK @@ -84,7 +84,7 @@ jobs: [all:vars] ansible_port=22 - ansible_ssh_user=root + ansible_ssh_user=shenlan ansible_ssh_private_key_file=~/.ssh/id_rsa ansible_host_key_checking=False datadog_token=$DATADOG_API_KEY diff --git a/playbook/jobs/init_k3s_cluster_apisix b/playbook/jobs/init_k3s_cluster_apisix index 5c63a0bf..7e4ee613 100644 --- a/playbook/jobs/init_k3s_cluster_apisix +++ b/playbook/jobs/init_k3s_cluster_apisix @@ -29,7 +29,7 @@ namespace: ingress auto_issuance: true update_secret: true - external_dns: enable + external_dns: disable svc_discovery: enable tls: - secret_name: nginx-tls diff --git a/playbook/jobs/init_k3s_cluster_artifact b/playbook/jobs/init_k3s_cluster_artifact index 05d1996f..0486f529 100644 --- a/playbook/jobs/init_k3s_cluster_artifact +++ b/playbook/jobs/init_k3s_cluster_artifact @@ -1,4 +1,4 @@ -- name: set apisix cluster with vhosts +- name: set artifact cluster with vhosts hosts: all user: root become: yes @@ -9,8 +9,6 @@ vars: group: master cni: kubeovn - ingress: nginx - external_dns: disable version: 'v1.24.7+k3s1' pod_cidr: '10.20.0.0/16' pod_gateway: '10.20.0.1' @@ -18,5 +16,12 @@ cluster_dns: '172.16.0.10' cluster_domain: 'cluster.local' join_cidr: '100.64.0.0/16' - cni_iface: 'eth0' - cni_tunnel: 'geneve' + - include_role: + name: k3s-addon + vars: + group: master + ingress: nginx + external_dns: enable + svc_discovery: enable + auto_issuance: false + update_secret: false