Skip to content

AGENT-1517: fix iri deletion test #6070

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
May 20, 2026
Merged

AGENT-1517: fix iri deletion test #6070

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
20 changes: 15 additions & 5 deletions test/e2e-iri/iri_delete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,23 @@ func TestIRIController_IRIDelete(t *testing.T) {
_, err = cs.MachineConfigs().Get(ctx, "02-master-internalreleaseimage", v1.GetOptions{})
require.NoError(t, err, "Master MC should exist before deletion")

// Remove the VAP binding that prevents IRI deletion.
// Remove the VAP binding and delete the IRI in a retry loop.
// The operator sync may re-create the binding between the two operations.
vapBindingName := "internalreleaseimage-deletion-guard-binding"
err = cs.GetKubeclient().AdmissionregistrationV1().ValidatingAdmissionPolicyBindings().Delete(ctx, vapBindingName, v1.DeleteOptions{})
require.NoError(t, err, "Should be able to delete VAP binding")
err = wait.PollUntilContextTimeout(ctx, 2*time.Second, 1*time.Minute, true, func(ctx context.Context) (bool, error) {
delErr := cs.GetKubeclient().AdmissionregistrationV1().ValidatingAdmissionPolicyBindings().Delete(ctx, vapBindingName, v1.DeleteOptions{})
if delErr != nil && !k8serrors.IsNotFound(delErr) {
t.Logf("Failed to delete VAP binding (will retry): %v", delErr)
return false, nil
}

// Delete the IRI resource.
err = cs.InternalReleaseImages().Delete(ctx, "cluster", v1.DeleteOptions{})
delErr = cs.InternalReleaseImages().Delete(ctx, "cluster", v1.DeleteOptions{})
if delErr == nil {
return true, nil
}
t.Logf("Failed to delete IRI (will retry): %v", delErr)
return false, nil
})
require.NoError(t, err, "Should be able to delete IRI after VAP binding removal")

// Wait for the IRI to be fully garbage-collected (finalizer removed).
Expand Down