Skip to content

e2e-vsphere: remove DNS VIPs #8372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 24, 2020
Merged

e2e-vsphere: remove DNS VIPs #8372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions ci-operator/step-registry/ipi/conf/vsphere/dns/ipi-conf-vsphere-dns-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

1 change: 0 additions & 1 deletion ci-operator/step-registry/ipi/conf/vsphere/ipi-conf-vsphere-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ platform:
vCenter: vcsa-ci.vmware.devcluster.openshift.com
apiVIP: "${vips[0]}"
ingressVIP: "${vips[1]}"
dnsVIP: "${vips[2]}"
EOF
3 changes: 1 addition & 2 deletions ci-operator/step-registry/ipi/conf/vsphere/vips/ipi-conf-vsphere-vips-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
2 changes: 1 addition & 1 deletion ...rator/step-registry/ipi/deprovision/vsphere/vips/ipi-deprovision-vsphere-vips-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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