diff --git a/.github/workflows/use-setup-k3s-cluster.yml b/.github/workflows/use-setup-k3s-cluster.yml index 9efbdcf1..3a93d5a7 100644 --- a/.github/workflows/use-setup-k3s-cluster.yml +++ b/.github/workflows/use-setup-k3s-cluster.yml @@ -71,5 +71,9 @@ jobs: shell: bash run: | export ANSIBLE_HOST_KEY_CHECKING=False - ansible-playbook -i hosts/inventory init_k3s_cluster_std -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 "dns_ak=$DNS_AK" \ + -e "dns_sk=$DNS_SK" \ + -e "domain=${{inputs.domain}}" -D working-directory: playbook/ diff --git a/playbook/ansible_playbook_hosts_setup.sh b/playbook/ansible_playbook_hosts_setup.sh index 9bc2844a..1ebc724e 100644 --- a/playbook/ansible_playbook_hosts_setup.sh +++ b/playbook/ansible_playbook_hosts_setup.sh @@ -9,7 +9,7 @@ check_empty() { } # List of variables to check -variables=("DNS_AK" "DNS_SK" "SSH_USER" "SSH_HOST_IP" "SSH_HOST_DOMAIN" "SSH_PRIVATE_KEY") +variables=("DNS_AK" "DNS_SK" "DOMAIN" "SSH_USER" "SSH_HOST_IP" "SSH_HOST_DOMAIN" "SSH_PRIVATE_KEY") # Loop through variables and check if each one is empty for var in "${variables[@]}"; do @@ -37,6 +37,4 @@ ansible_ssh_user=$SSH_USER ansible_ssh_private_key_file=~/.ssh/id_rsa ansible_host_key_checking=False ingress_ip=$SSH_HOST_IP -dns_ak=$DNS_AK -dns_sk=$DNS_SK EOF diff --git a/playbook/roles/k3s-addon/files/setup-dns-provider.sh b/playbook/roles/k3s-addon/files/setup-dns-provider.sh index 1cc2277c..bfbd226f 100644 --- a/playbook/roles/k3s-addon/files/setup-dns-provider.sh +++ b/playbook/roles/k3s-addon/files/setup-dns-provider.sh @@ -10,27 +10,23 @@ check_empty() { # List of variables to check ; Loop through variables and check if each one is empty -variables=("ak" "sk" "domain") +variables=("DNS_AK" "DNS_SK" "DOMAIN") for var in "${variables[@]}"; do check_empty "$var" done -ak=$1 -sk=$2 -domain=$3 - cat > external-dns-values.yaml << EOF clusterDomain: admin.local sources: - service - ingress domainFilters: - - $domain + - $DOMAIN policy: upsert-only provider: alibabacloud alibabacloud: - accessKeyId: $ak - accessKeySecret: $sk + accessKeyId: $DNS_AK + accessKeySecret: $DNS_SK regionId: rg-acfm2akhd255pgi zoneType: public EOF