From 2d830d35dede891de4050aae71fad6a1df7ba8a4 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 27 Dec 2023 20:31:53 +0800 Subject: [PATCH] files/setup-dns-provider.sh: update --- playbook/ansible_playbook_hosts_setup.sh | 2 ++ .../k3s-addon/files/setup-dns-provider.sh | 23 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/playbook/ansible_playbook_hosts_setup.sh b/playbook/ansible_playbook_hosts_setup.sh index 1ebc724e..9b3d264d 100644 --- a/playbook/ansible_playbook_hosts_setup.sh +++ b/playbook/ansible_playbook_hosts_setup.sh @@ -38,3 +38,5 @@ ansible_ssh_private_key_file=~/.ssh/id_rsa ansible_host_key_checking=False ingress_ip=$SSH_HOST_IP EOF + +cat hosts/inventory diff --git a/playbook/roles/k3s-addon/files/setup-dns-provider.sh b/playbook/roles/k3s-addon/files/setup-dns-provider.sh index bfbd226f..beb17d5e 100644 --- a/playbook/roles/k3s-addon/files/setup-dns-provider.sh +++ b/playbook/roles/k3s-addon/files/setup-dns-provider.sh @@ -1,20 +1,19 @@ #!/bin/bash -# Function to check if a variable is empty -check_empty() { - if [ -z "${!1}" ]; then - echo "$1 is empty. Aborting." - exit 1 - fi +# 检查参数是否为空 +check_not_empty() { + if [[ -z $1 ]]; then + echo "Error: $2 is empty. Please provide a value." + exit 1 + fi } -# List of variables to check ; Loop through variables and check if each one is empty - -variables=("DNS_AK" "DNS_SK" "DOMAIN") -for var in "${variables[@]}"; do - check_empty "$var" -done +# 检查参数是否为空 +check_not_empty "$1" "DNS_AK" && DNS_AK=$1 +check_not_empty "$2" "DNS_SK" && DNS_SK=$2 +check_not_empty "$3" "DOMAIN" && DOMAIN=$3 +# Deploy external-dns cat > external-dns-values.yaml << EOF clusterDomain: admin.local sources: