Skip to content

Commit 43c0796

Browse files
committed
minor fixes
Signed-off-by: Britania Rodriguez Reyes <britaniar@microsoft.com>
1 parent 9fa5f5d commit 43c0796

File tree

3 files changed

+1
-34
lines changed

3 files changed

+1
-34
lines changed

pkg/controllers/workapplier/controller.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,11 +561,6 @@ func (r *Reconciler) ensureAppliedWork(ctx context.Context, work *fleetv1beta1.W
561561
return nil, controller.NewAPIServerError(false, err)
562562
}
563563
}
564-
565-
if err := r.spokeClient.Get(ctx, types.NamespacedName{Name: workRef.Name}, appliedWork); err != nil {
566-
klog.ErrorS(err, "Failed to get the appliedWork", "appliedWork", appliedWork.Name)
567-
return nil, controller.NewAPIServerError(false, err)
568-
}
569564
klog.InfoS("Recreated the appliedWork resource", "appliedWork", workRef.Name)
570565
return appliedWork, nil
571566
}

test/e2e/placement_ro_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ var _ = Context("creating resourceOverride (selecting all clusters) to override
199199
})
200200
})
201201

202-
var _ = Context("creating resourceOverride with multiple jsonPatchOverrides to override configMap", Ordered, func() {
202+
var _ = FContext("creating resourceOverride with multiple jsonPatchOverrides to override configMap", Ordered, func() {
203203
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
204204
roName := fmt.Sprintf(roNameTemplate, GinkgoParallelProcess())
205205
roNamespace := fmt.Sprintf(workNamespaceNameTemplate, GinkgoParallelProcess())

test/e2e/utils_test.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -954,34 +954,6 @@ func ensureCRPDisruptionBudgetDeleted(crpDisruptionBudgetName string) {
954954
Eventually(removedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "CRP disruption budget still exists")
955955
}
956956

957-
func removeOtherOwner(cluster *framework.Cluster) {
958-
ns := appNamespace()
959-
otherOwner := metav1.OwnerReference{
960-
APIVersion: "another-api-version",
961-
Kind: "another-kind",
962-
Name: "another-owner",
963-
UID: "another-uid",
964-
}
965-
966-
Eventually(func() error {
967-
if err := cluster.KubeClient.Get(ctx, types.NamespacedName{Name: ns.Name}, &ns); err != nil {
968-
return err
969-
}
970-
// Filter out the owner reference you want to remove
971-
newOwnerRefs := []metav1.OwnerReference{}
972-
for _, ref := range ns.OwnerReferences {
973-
if ref.Name != otherOwner.Name {
974-
newOwnerRefs = append(newOwnerRefs, ref)
975-
} else if ref.Name == otherOwner.Name {
976-
By(fmt.Sprintf("Removing owner reference %s from namespace %s", otherOwner.Name, ns.Name))
977-
}
978-
}
979-
980-
ns.SetOwnerReferences(newOwnerRefs)
981-
return cluster.KubeClient.Update(ctx, &ns)
982-
}, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove other owner from namespace %s", ns.Name)
983-
}
984-
985957
// verifyWorkPropagationAndMarkAsAvailable verifies that works derived from a specific CPR have been created
986958
// for a specific cluster, and marks these works in the specific member cluster's
987959
// reserved namespace as applied and available.

0 commit comments

Comments
 (0)