Skip to content

Nuke HCP, patch vs update and log #1861

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 3 commits into from
Aug 4, 2025
Merged

Nuke HCP, patch vs update and log #1861

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7279df
Nuke HCP, patch vs update and log
weshayutin Jul 31, 2025
c62cc99
remove finalizer w/ controllerutil one at a time
weshayutin Aug 1, 2025
2435ed3
second spot to update w/ controllerutil
weshayutin Aug 1, 2025
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
23 changes: 19 additions & 4 deletions tests/e2e/lib/hcp/hcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"github.com/openshift/oadp-operator/tests/e2e/lib"
)
Expand Down Expand Up @@ -308,8 +309,15 @@ func (h *HCHandler) NukeHostedCluster() error {
Namespace: h.HostedCluster.Namespace,
}, hc)
if err == nil && len(hc.GetFinalizers()) > 0 {
log.Printf("\tNUKE: Removing finalizers from HostedCluster %s", hc.Name)
hc.SetFinalizers([]string{})
finalizers := hc.GetFinalizers()
log.Printf("\tNUKE: HostedCluster %s has finalizers: %v", hc.Name, finalizers)

// Remove each finalizer found on the HostedCluster
for _, finalizer := range finalizers {
log.Printf("\tNUKE: Removing finalizer %s from HostedCluster %s", finalizer, hc.Name)
controllerutil.RemoveFinalizer(hc, finalizer)
}

if err := h.Client.Update(h.Ctx, hc); err != nil {
return fmt.Errorf("\tNUKE: Error removing finalizers from HostedCluster %s: %v", hc.Name, err)
}
Expand Down Expand Up @@ -338,8 +346,15 @@ func (h *HCHandler) NukeHostedCluster() error {

for _, item := range obj.Items {
if len(item.GetFinalizers()) > 0 {
log.Printf("\tNUKE: Removing finalizers from %s %s", rt.kind, item.GetName())
item.SetFinalizers([]string{})
finalizers := item.GetFinalizers()
log.Printf("\tNUKE: %s %s has finalizers: %v", rt.kind, item.GetName(), finalizers)

// Remove each finalizer found on the resource
for _, finalizer := range finalizers {
log.Printf("\tNUKE: Removing finalizer %s from %s %s", finalizer, rt.kind, item.GetName())
controllerutil.RemoveFinalizer(&item, finalizer)
}

if err := h.Client.Update(h.Ctx, &item); err != nil {
return fmt.Errorf("\tNUKE: Error removing finalizers from %s %s: %v", rt.kind, item.GetName(), err)
}
Expand Down