Skip to content

fix(hypershift/gcp): handle missing hosted-cluster-name in deprovision #76930

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-bot merged 1 commit into from
Mar 27, 2026
Merged

fix(hypershift/gcp): handle missing hosted-cluster-name in deprovision #76930

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
50 changes: 31 additions & 19 deletions ...r/step-registry/hypershift/gcp/gke/deprovision/hypershift-gcp-gke-deprovision-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,17 @@ fi
# Load cluster info from provision and hosted-cluster-setup steps
CP_PROJECT_ID="$(<"${SHARED_DIR}/control-plane-project-id")"
CP_CLUSTER_NAME="$(<"${SHARED_DIR}/control-plane-cluster-name")"
HC_CLUSTER_NAME="$(<"${SHARED_DIR}/hosted-cluster-name")"
GCP_REGION="$(<"${SHARED_DIR}/gcp-region")"

# hosted-cluster-name may not exist if job was aborted before hosted-cluster-setup ran
if [[ -f "${SHARED_DIR}/hosted-cluster-name" ]]; then
HC_CLUSTER_NAME="$(<"${SHARED_DIR}/hosted-cluster-name")"
else
HC_CLUSTER_NAME=""
echo "WARNING: hosted-cluster-name not found - hosted cluster setup may not have completed"
echo "Will skip DNS cleanup but still deprovision GKE cluster and projects"
fi

# Hosted Cluster project file path (may not exist if provision failed early)
HC_PROJECT_FILE="${SHARED_DIR}/hosted-cluster-project-id"
if [[ -f "${HC_PROJECT_FILE}" ]]; then
Expand Down Expand Up @@ -90,25 +98,29 @@ gcloud projects delete "${CP_PROJECT_ID}" --quiet || true
EXTERNAL_DNS_GSA="external-dns@${HYPERSHIFT_GCP_CI_PROJECT}.iam.gserviceaccount.com"

# Clean up DNS records from the CI zone (DNS records use the hosted cluster name)
echo "Cleaning up DNS records for hosted cluster ${HC_CLUSTER_NAME}..."
DNS_SUFFIX="in.${HC_CLUSTER_NAME}.${HYPERSHIFT_GCP_CI_DNS_DOMAIN}."
DNS_RECORDS=$(gcloud dns record-sets list \
--zone="${HYPERSHIFT_GCP_CI_DNS_ZONE}" \
--project="${HYPERSHIFT_GCP_CI_PROJECT}" \
--filter="name ~ ${DNS_SUFFIX}" \
--format="csv[no-heading](name,type)" 2>/dev/null || true)

if [[ -n "${DNS_RECORDS}" ]]; then
while IFS=, read -r name type; do
[[ -z "${name}" ]] && continue
echo "Deleting DNS record: ${name} ${type}"
gcloud dns record-sets delete "${name}" \
--type="${type}" \
--zone="${HYPERSHIFT_GCP_CI_DNS_ZONE}" \
--project="${HYPERSHIFT_GCP_CI_PROJECT}" --quiet || true
done <<< "${DNS_RECORDS}"
if [[ -n "${HC_CLUSTER_NAME}" ]]; then
echo "Cleaning up DNS records for hosted cluster ${HC_CLUSTER_NAME}..."
DNS_SUFFIX="in.${HC_CLUSTER_NAME}.${HYPERSHIFT_GCP_CI_DNS_DOMAIN}."
DNS_RECORDS=$(gcloud dns record-sets list \
--zone="${HYPERSHIFT_GCP_CI_DNS_ZONE}" \
--project="${HYPERSHIFT_GCP_CI_PROJECT}" \
--filter="name ~ ${DNS_SUFFIX}" \
--format="csv[no-heading](name,type)" 2>/dev/null || true)

if [[ -n "${DNS_RECORDS}" ]]; then
while IFS=, read -r name type; do
[[ -z "${name}" ]] && continue
echo "Deleting DNS record: ${name} ${type}"
gcloud dns record-sets delete "${name}" \
--type="${type}" \
--zone="${HYPERSHIFT_GCP_CI_DNS_ZONE}" \
--project="${HYPERSHIFT_GCP_CI_PROJECT}" --quiet || true
done <<< "${DNS_RECORDS}"
else
echo "No DNS records found matching ${DNS_SUFFIX}"
fi
else
echo "No DNS records found matching ${DNS_SUFFIX}"
echo "Skipping DNS cleanup - hosted cluster name not available"
fi

# Remove ExternalDNS WIF bindings
Expand Down