Skip to content

fix: fix crp controller & its unit tests #408

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
zhiying-lin merged 1 commit into from
Jun 30, 2023
Merged

fix: fix crp controller & its unit tests #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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 {
Expand Down
12 changes: 3 additions & 9 deletions pkg/controllers/clusterresourceplacement/clusterresourceplacement_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down