fix the UT and e2e

Signed-off-by: Ryan Zhang <[email protected]>

Author: ryanzhang-oss

pkg/controllers/placement/controller_test.go

@@ -4476,7 +4476,7 @@ func TestShouldCreateNewResourceSnapshotNow(t *testing.T) {
 			collectionDuration: 30 * time.Second,
 			annotationValue:    now.Add(-10 * time.Second).Format(time.RFC3339),
 			wantAnnoation:      true,
-			wantRequeue:        ctrl.Result{Requeue: true, RequeueAfter: 20 * time.Second},
+			wantRequeue:        ctrl.Result{RequeueAfter: 20 * time.Second},
 		},
 		{
 			name:               "ResourceChangesCollectionDuration is 0",
@@ -4486,7 +4486,7 @@ func TestShouldCreateNewResourceSnapshotNow(t *testing.T) {
 			// no annotation → sets it and requeues
 			annotationValue: "",
 			wantAnnoation:   true,
-			wantRequeue:     ctrl.Result{Requeue: true, RequeueAfter: 295 * time.Second},
+			wantRequeue:     ctrl.Result{RequeueAfter: 295 * time.Second},
 		},
 		{
 			name:               "next detection time (now) + collection duration < latest resource snapshot creation time + creation interval",
@@ -4496,7 +4496,7 @@ func TestShouldCreateNewResourceSnapshotNow(t *testing.T) {
 			// no annotation → sets it and requeues
 			annotationValue: "",
 			wantAnnoation:   true,
-			wantRequeue:     ctrl.Result{Requeue: true, RequeueAfter: 295 * time.Second},
+			wantRequeue:     ctrl.Result{RequeueAfter: 295 * time.Second},
 		},
 		{
 			name:               "next detection time (annotation) + collection duration < latest resource snapshot creation time + creation interval",
@@ -4505,23 +4505,23 @@ func TestShouldCreateNewResourceSnapshotNow(t *testing.T) {
 			creationTime:       now.Add(-10 * time.Second),
 			annotationValue:    now.Add(-5 * time.Second).Format(time.RFC3339),
 			wantAnnoation:      true,
-			wantRequeue:        ctrl.Result{Requeue: true, RequeueAfter: 290 * time.Second},
+			wantRequeue:        ctrl.Result{RequeueAfter: 290 * time.Second},
 		},
 		{
 			name:               "last resource snapshot created long time before",
 			creationInterval:   60 * time.Second,
 			collectionDuration: 30 * time.Second,
 			creationTime:       now.Add(-1 * time.Hour),
 			wantAnnoation:      true,
-			wantRequeue:        ctrl.Result{Requeue: true, RequeueAfter: 30 * time.Second},
+			wantRequeue:        ctrl.Result{RequeueAfter: 30 * time.Second},
 		},
 		{
 			name:               "next detection time (now) + collection duration >= latest resource snapshot creation time + creation interval",
 			creationInterval:   60 * time.Second,
 			collectionDuration: 60 * time.Second,
 			creationTime:       now.Add(-40 * time.Second),
 			wantAnnoation:      true,
-			wantRequeue:        ctrl.Result{Requeue: true, RequeueAfter: 60 * time.Second},
+			wantRequeue:        ctrl.Result{RequeueAfter: 60 * time.Second},
 		},
 	}
 

pkg/controllers/workapplier/apply_test.go

@@ -384,7 +384,7 @@ func TestSetFleetLastAppliedAnnotation(t *testing.T) {
 	nsManifestObj1 := ns.DeepCopy()
 	wantNSManifestObj1 := ns.DeepCopy()
 	wantNSManifestObj1.SetAnnotations(map[string]string{
-		fleetv1beta1.LastAppliedConfigAnnotation: string("{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"annotations\":{},\"creationTimestamp\":null,\"name\":\"ns-1\"},\"spec\":{},\"status\":{}}\n"),
+		fleetv1beta1.LastAppliedConfigAnnotation: string("{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"annotations\":{},\"name\":\"ns-1\"},\"spec\":{},\"status\":{}}\n"),
 	})
 
 	nsManifestObj2 := ns.DeepCopy()
@@ -393,7 +393,7 @@ func TestSetFleetLastAppliedAnnotation(t *testing.T) {
 	})
 	wantNSManifestObj2 := ns.DeepCopy()
 	wantNSManifestObj2.SetAnnotations(map[string]string{
-		fleetv1beta1.LastAppliedConfigAnnotation: string("{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"annotations\":{},\"creationTimestamp\":null,\"name\":\"ns-1\"},\"spec\":{},\"status\":{}}\n"),
+		fleetv1beta1.LastAppliedConfigAnnotation: string("{\"apiVersion\":\"v1\",\"kind\":\"Namespace\",\"metadata\":{\"annotations\":{},\"name\":\"ns-1\"},\"spec\":{},\"status\":{}}\n"),
 	})
 
 	// Annotation size limit is 262144 bytes.

test/e2e/join_and_leave_test.go

@@ -516,9 +516,7 @@ var _ = Describe("Test member cluster join and leave with clusterProfile", Label
 		})
 
 		It("Delete member cluster CR associated to the member cluster to simulate member left", func() {
-			var mc clusterv1beta1.MemberCluster
-			Expect(hubClient.Get(ctx, types.NamespacedName{Name: memberCluster3WestProdName}, &mc)).To(Succeed(), "Failed to get member cluster")
-			Expect(hubClient.Delete(ctx, &mc)).Should(Succeed())
+			markMemberClusterAsLeft(memberCluster3WestProdName)
 		})
 
 		It("Make sure we delete the corresponding cluster profiles", func() {