From 4a17d94475b6db891a269d3d9cdd44606d8209f3 Mon Sep 17 00:00:00 2001 From: Zhiying Lin Date: Fri, 30 Jun 2023 09:55:46 +0800 Subject: [PATCH] fix: fix crp controller & its unit tests --- .../clusterresourceplacement_controller.go | 5 ++--- .../clusterresourceplacement_controller_test.go | 12 +++--------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller.go b/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller.go index 4d953cc97..73aec701a 100644 --- a/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller.go +++ b/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller.go @@ -27,7 +27,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, _ controller.QueueKey) (ctrl // clusterPolicySnapshot status and work status. // If the error type is ErrUnexpectedBehavior, the controller will skip the reconciling. func (r *Reconciler) handleUpdate(ctx context.Context, crp *fleetv1beta1.ClusterResourcePlacement) (ctrl.Result, error) { - latestPolicySnapshot, err := r.getOrCreateClusterPolicySnapshot(ctx, crp) + _, err := r.getOrCreateClusterPolicySnapshot(ctx, crp) if err != nil { return ctrl.Result{}, err } @@ -36,8 +36,7 @@ func (r *Reconciler) handleUpdate(ctx context.Context, crp *fleetv1beta1.Cluster return ctrl.Result{}, err } resourceSnapshotSpec := fleetv1beta1.ResourceSnapshotSpec{ - SelectedResources: selectedResources, - PolicySnapshotName: latestPolicySnapshot.Name, + SelectedResources: selectedResources, } _, err = r.getOrCreateClusterResourceSnapshot(ctx, crp, &resourceSnapshotSpec) if err != nil { diff --git a/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller_test.go b/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller_test.go index 3a952ae1c..9d91b39cc 100644 --- a/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller_test.go +++ b/pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller_test.go @@ -935,20 +935,16 @@ func TestGetOrCreateClusterResourceSnapshot(t *testing.T) { selectedResources := []fleetv1beta1.ResourceContent{ *serviceResourceContentForTest(t), } - policyA := "policy-a" resourceSnapshotSpecA := &fleetv1beta1.ResourceSnapshotSpec{ - SelectedResources: selectedResources, - PolicySnapshotName: policyA, + SelectedResources: selectedResources, } jsonBytes, err := json.Marshal(resourceSnapshotSpecA) if err != nil { t.Fatalf("failed to create the resourceSnapshotSpecA hash: %v", err) } resourceSnapshotAHash := fmt.Sprintf("%x", sha256.Sum256(jsonBytes)) - policyB := "policy-b" resourceSnapshotSpecB := &fleetv1beta1.ResourceSnapshotSpec{ - SelectedResources: selectedResources, - PolicySnapshotName: policyB, + SelectedResources: []fleetv1beta1.ResourceContent{}, } jsonBytes, err = json.Marshal(resourceSnapshotSpecB) @@ -1335,10 +1331,8 @@ func TestGetOrCreateClusterResourceSnapshot_failure(t *testing.T) { selectedResources := []fleetv1beta1.ResourceContent{ *serviceResourceContentForTest(t), } - policyA := "policy-a" resourceSnapshotSpecA := &fleetv1beta1.ResourceSnapshotSpec{ - SelectedResources: selectedResources, - PolicySnapshotName: policyA, + SelectedResources: selectedResources, } tests := []struct { name string