NO-ISSUE: fix 'object has been modified' error in kube-api subsystem (#…

…6880)

Similar to #6850,
fixed timing issue in kube-api test on BMH update.
Also, removed BMH finalizers on cleanup.

subsystem/kubeapi_test.go

@@ -396,8 +396,15 @@ func deployBMHCRD(ctx context.Context, client k8sclient.Client, id string, spec
 	err := client.Create(ctx, &bmh)
 	Expect(err).To(BeNil())
 
-	bmh.Status.Provisioning.State = metal3_v1alpha1.StateReady
-	Expect(client.Status().Update(ctx, &bmh)).To(BeNil())
+	bmhKey := types.NamespacedName{
+		Namespace: bmh.ObjectMeta.Namespace,
+		Name:      bmh.ObjectMeta.Name,
+	}
+	Eventually(func() error {
+		bmh = *getBmhCRD(ctx, client, bmhKey)
+		bmh.Status.Provisioning.State = metal3_v1alpha1.StateReady
+		return client.Status().Update(ctx, &bmh)
+	}, "30s", "10s").Should(BeNil())
 }
 
 func deployPPICRD(ctx context.Context, client k8sclient.Client, name string, spec *metal3_v1alpha1.PreprovisioningImageSpec) {
@@ -980,11 +987,24 @@ func cleanUpCRs(ctx context.Context, client k8sclient.Client) {
 	Eventually(func() error {
 		return client.DeleteAllOf(ctx, &v1beta1.Agent{}, k8sclient.InNamespace(Options.Namespace))
 	}, "1m", "2s").Should(BeNil())
+	Eventually(func() error {
+		return client.DeleteAllOf(ctx, &metal3_v1alpha1.PreprovisioningImage{}, k8sclient.InNamespace(Options.Namespace))
+	}, "1m", "2s").Should(BeNil())
 	Eventually(func() error {
 		return client.DeleteAllOf(ctx, &metal3_v1alpha1.BareMetalHost{}, k8sclient.InNamespace(Options.Namespace))
 	}, "1m", "2s").Should(BeNil())
 	Eventually(func() error {
-		return client.DeleteAllOf(ctx, &metal3_v1alpha1.PreprovisioningImage{}, k8sclient.InNamespace(Options.Namespace))
+		var err error
+		bareMetalHostList := &metal3_v1alpha1.BareMetalHostList{}
+		err = client.List(ctx, bareMetalHostList, k8sclient.InNamespace(Options.Namespace))
+		Expect(err).To(BeNil())
+		// Remove finalizers to avoid stuck BMHs
+		funk.ForEach(bareMetalHostList.Items, func(bmh metal3_v1alpha1.BareMetalHost) {
+			patch := k8sclient.MergeFrom(bmh.DeepCopy())
+			bmh.ObjectMeta.Finalizers = nil
+			err = client.Patch(ctx, &bmh, patch)
+		})
+		return err
 	}, "1m", "2s").Should(BeNil())
 
 	// Check if tests pull secret exists and needs to be deleted