Skip to content

feat: Remove immature internalMemberCluster CR update #110

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
minhng22 merged 1 commit into from
Jun 20, 2022
Merged

feat: Remove immature internalMemberCluster CR update #110

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: 1 addition & 4 deletions pkg/controllers/internalmembercluster/member_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,7 @@ func (r *Reconciler) updateHeartbeat(ctx context.Context, memberCluster *fleetv1
membershipState := r.getMembershipClusterState()

if membershipState != fleetv1alpha1.ClusterStateJoin {
r.markInternalMemberClusterUnknown(memberCluster)
err := r.updateInternalMemberClusterWithRetry(ctx, memberCluster)
return ctrl.Result{RequeueAfter: time.Minute},
errors.Wrap(err, "error marking internal member cluster as unknown")
return ctrl.Result{RequeueAfter: time.Minute}, nil
Copy link
Contributor

@helayoty helayoty Jun 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make sure that the UT is updated as well to reflect this change?

Copy link
Member Author

@minhng22 minhng22 Jun 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I tested the suite(s), not just the integration tests. This change isn't covered in UT and is covered in the controller tests (ginkgo).

}

collectErr := r.collectMemberClusterUsage(ctx, memberCluster)
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/metrics_exposure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"go.goms.io/fleet/test/e2e/framework"
"k8s.io/client-go/kubernetes"

"go.goms.io/fleet/test/e2e/framework"
)

// TODO (mng): move this test to join/leave tests after those tests finished.
Expand Down