From a4adb6e9f013b1d42d788b353cb4723bbed9641f Mon Sep 17 00:00:00 2001
From: patrickdillon <padillon@redhat.com>
Date: Thu, 16 Apr 2020 16:07:28 -0400
Subject: [PATCH] e2e-vsphere: remove DNS VIPs

Updates vSphere steps job for the removal of self-hosted DNS.
---
 .../dns/ipi-conf-vsphere-dns-commands.sh        | 17 -----------------
 .../conf/vsphere/ipi-conf-vsphere-commands.sh   |  1 -
 .../vips/ipi-conf-vsphere-vips-commands.sh      |  3 +--
 .../ipi-deprovision-vsphere-vips-commands.sh    |  2 +-
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/ci-operator/step-registry/ipi/conf/vsphere/dns/ipi-conf-vsphere-dns-commands.sh b/ci-operator/step-registry/ipi/conf/vsphere/dns/ipi-conf-vsphere-dns-commands.sh
index 08512de8d469d..44569b9a7a5ed 100644
--- a/ci-operator/step-registry/ipi/conf/vsphere/dns/ipi-conf-vsphere-dns-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/vsphere/dns/ipi-conf-vsphere-dns-commands.sh
@@ -16,7 +16,6 @@ export AWS_SHARED_CREDENTIALS_FILE=${cluster_profile}/.awscred
 # Load array created in setup-vips:
 # 0: API
 # 1: Ingress
-# 2: DNS
 declare -a vips
 mapfile -t vips < "${SHARED_DIR}"/vips.txt
 
@@ -46,14 +45,6 @@ cat > "${SHARED_DIR}"/dns-create.json <<EOF
       "TTL": 60,
       "ResourceRecords": [{"Value": "${vips[1]}"}]
       }
-    },{
-    "Action": "UPSERT",
-    "ResourceRecordSet": {
-      "Name": "$cluster_domain.",
-      "Type": "NS",
-      "TTL": 300,
-      "ResourceRecords": [{"Value": "${vips[2]}"}]
-      }
 }]}
 EOF
 
@@ -79,14 +70,6 @@ cat > "${SHARED_DIR}"/dns-delete.json <<EOF
       "TTL": 60,
       "ResourceRecords": [{"Value": "${vips[1]}"}]
       }
-    },{
-    "Action": "DELETE",
-    "ResourceRecordSet": {
-      "Name": "$cluster_domain.",
-      "Type": "NS",
-      "TTL": 300,
-      "ResourceRecords": [{"Value": "${vips[2]}"}]
-      }
 }]}
 EOF
 
diff --git a/ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh b/ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh
index 910af1e9fc94f..c6e7125352394 100755
--- a/ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh
@@ -26,5 +26,4 @@ platform:
     vCenter: vcsa-ci.vmware.devcluster.openshift.com
     apiVIP: "${vips[0]}"
     ingressVIP: "${vips[1]}"
-    dnsVIP: "${vips[2]}"
 EOF
diff --git a/ci-operator/step-registry/ipi/conf/vsphere/vips/ipi-conf-vsphere-vips-commands.sh b/ci-operator/step-registry/ipi/conf/vsphere/vips/ipi-conf-vsphere-vips-commands.sh
index df037129de83f..7623761d78741 100755
--- a/ci-operator/step-registry/ipi/conf/vsphere/vips/ipi-conf-vsphere-vips-commands.sh
+++ b/ci-operator/step-registry/ipi/conf/vsphere/vips/ipi-conf-vsphere-vips-commands.sh
@@ -11,11 +11,10 @@ ipam_token=$(grep -oP 'ipam_token="\K[^"]+' ${tfvars_path})
 # Array to hold virtual ips:
 # 0: API
 # 1: Ingress
-# 2: DNS
 declare -a vips
 
 echo "Reserving virtual ip addresses from the IPAM server..."
-for i in {0..2}
+for i in {0..1}
 do
   args=$(jq -n \
             --arg hostn "$cluster_name-$i" \
diff --git a/ci-operator/step-registry/ipi/deprovision/vsphere/vips/ipi-deprovision-vsphere-vips-commands.sh b/ci-operator/step-registry/ipi/deprovision/vsphere/vips/ipi-deprovision-vsphere-vips-commands.sh
index 13476015b1d89..40d6229ffd074 100755
--- a/ci-operator/step-registry/ipi/deprovision/vsphere/vips/ipi-deprovision-vsphere-vips-commands.sh
+++ b/ci-operator/step-registry/ipi/deprovision/vsphere/vips/ipi-deprovision-vsphere-vips-commands.sh
@@ -13,7 +13,7 @@ export AWS_SHARED_CREDENTIALS_FILE="${cluster_profile}/.awscred"
 
 # FIXME: should this be using ${SHARED_DIR}/vips.txt ?
 echo "Releasing IP addresses from IPAM server..."
-for i in {0..2}
+for i in {0..1}
 do
     curl "http://139.178.89.254/api/removeHost.php?apiapp=address&apitoken=${ipam_token}&host=${cluster_name}-$i"
 done