Merge pull request #551 from thockin/dns-fix-lame-delegation

Fix check-zone to use cooked configs
kubernetes · Jan 28, 2020 · 9be75de · 9be75de
2 parents 1a5bc1f + 51ed690
commit 9be75de
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/dns/check-zone.sh b/dns/check-zone.sh
@@ -21,19 +21,22 @@
 
 read -r -d '' USAGE <<- EOF
   Usage:
-  $0 example.com.\t\t\t# Check a single zone
-  $0 example.com. example.io.\t# Check a multiple zones
+  $0 -c confdir example.com.\t\t# Check a single zone
+  $0 -c confdir example.com. example.io.\t# Check a multiple zones
 EOF
 
-while getopts ":h" opt; do
+while getopts ":hc:" opt; do
   case ${opt} in
+    c )
+      TMPCFG="${OPTARG}"
+      ;;
     h )
       echo -e "${USAGE}"
       exit 0
       ;;
     \? )
     echo -e "Invalid option.\n" >&2
-    echo -e "${USAGE}"
+    echo -e "${USAGE}" >&2
     exit 1
       ;;
   esac
@@ -42,12 +45,23 @@ shift $((OPTIND -1))
 
 DOMAINS=("$@")
 
+if [ -z "${TMPCFG}" ]; then
+    echo -e "confdir must be specified" >&2
+    echo -e "${USAGE}" >&2
+    exit 2
+fi
+if [ ! -d "${TMPCFG}" ]; then
+    echo -e "confdir must exist" >&2
+    echo -e "${USAGE}" >&2
+    exit 2
+fi
+
 echo "Checking that the GCP dns servers for (${DOMAINS[@]}) serve up everything in our octodns config"
 docker run -ti \
        -u `id -u` \
        -v ~/.config/gcloud:/.config/gcloud:ro \
        -v `pwd`/octodns-config.yaml:/octodns/config.yaml:ro \
-       -v `pwd`/zone-configs:/octodns/config:ro \
+       -v "${TMPCFG}":/octodns/config:ro \
        ${USER}/octodns \
        check-zone \
        --config-file=/octodns/config.yaml \

diff --git a/dns/push.sh b/dns/push.sh
@@ -92,7 +92,7 @@ for zone in "${CANARY_ZONES[@]}"; do
     TRIES=12
     echo "Testing canary zone: $zone"
     for i in $(seq 1 "$TRIES"); do
-        ./check-zone.sh "$zone" >> log.canary 2>&1
+        ./check-zone.sh -c "${TMPCFG}" "$zone" >> log.canary 2>&1
         if [ $? == 0 ]; then
             break
         fi
@@ -133,7 +133,7 @@ for zone in "${PROD_ZONES[@]}"; do
     TRIES=12
     echo "Testing prod zone: $zone"
     for i in $(seq 1 "$TRIES"); do
-        ./check-zone.sh "$zone" >> log.prod 2>&1
+        ./check-zone.sh -c "${TMPCFG}" "$zone" >> log.prod 2>&1
         if [ $? == 0 ]; then
             break
         fi