Skip to content

fix(dr): fully qualify Velero resource names in the rebuild workflow #2031

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
devantler merged 1 commit into from
Jun 11, 2026
Merged

fix(dr): fully qualify Velero resource names in the rebuild workflow #2031

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
14 changes: 9 additions & 5 deletions .github/workflows/dr-rebuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,18 @@ jobs:
run: |
set -euo pipefail
echo "Waiting for the BackupStorageLocation to be Available (Velero syncs old backups from R2)..."
kubectl -n velero wait backupstoragelocation/default \
# Velero resource names are fully qualified throughout: CNPG also
# defines a `backups` resource and kubectl resolves the unqualified
# name to backups.postgresql.cnpg.io on this cluster (the CI restore
# drill's first run failed exactly this way — see #1995).
kubectl -n velero wait backupstoragelocations.velero.io/default \
--for=jsonpath='{.status.phase}'=Available --timeout=15m

# Backup CRs are synced from the R2 bucket by Velero's backup-sync
# controller; give it a moment to populate after the BSL goes ready.
BACKUP=""
for i in $(seq 1 30); do
BACKUP=$(kubectl -n velero get backups -o json | jq -r \
BACKUP=$(kubectl -n velero get backups.velero.io -o json | jq -r \
'[.items[] | select(.status.phase=="Completed")] | sort_by(.metadata.creationTimestamp) | last | .metadata.name // empty')
[ -n "${BACKUP}" ] && break
echo " ...no Completed backups synced yet (${i}/30)"
Expand Down Expand Up @@ -169,7 +173,7 @@ jobs:
EOF
phase=""
for i in $(seq 1 180); do
phase=$(kubectl -n velero get restore "dr-rebuild-${GITHUB_RUN_ID}" -o jsonpath='{.status.phase}' 2>/dev/null || true)
phase=$(kubectl -n velero get restores.velero.io "dr-rebuild-${GITHUB_RUN_ID}" -o jsonpath='{.status.phase}' 2>/dev/null || true)
case "${phase}" in
Completed) break ;;
Failed|PartiallyFailed) break ;;
Expand All @@ -182,7 +186,7 @@ jobs:
# restore's job is to bring back resources Flux does NOT own (the
# old openbao-unseal comes back separately below).
if [ "${phase}" != "Completed" ] && [ "${phase}" != "PartiallyFailed" ]; then
kubectl -n velero describe restore "dr-rebuild-${GITHUB_RUN_ID}" || true
kubectl -n velero describe restores.velero.io "dr-rebuild-${GITHUB_RUN_ID}" || true
echo "::error::Velero restore did not finish (phase: ${phase:-<none>})."
exit 1
fi
Expand Down Expand Up @@ -325,7 +329,7 @@ jobs:
EOF
phase=""
for i in $(seq 1 60); do
phase=$(kubectl -n velero get restore "dr-openbao-secrets-${GITHUB_RUN_ID}" -o jsonpath='{.status.phase}' 2>/dev/null || true)
phase=$(kubectl -n velero get restores.velero.io "dr-openbao-secrets-${GITHUB_RUN_ID}" -o jsonpath='{.status.phase}' 2>/dev/null || true)
case "${phase}" in
Completed|PartiallyFailed) break ;;
Failed) break ;;
Expand Down