Skip to content

fix: Clean/ consistent up var name #111

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

Closed
minhng22 wants to merge 1 commit into from
Closed

fix: Clean/ consistent up var name #111

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
12 changes: 6 additions & 6 deletions pkg/controllers/internalmembercluster/member_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,39 +225,39 @@ func (r *Reconciler) markInternalMemberClusterJoined(internalMemberCluster apis.
klog.InfoS("mark internal member cluster as joined",
"namespace", internalMemberCluster.GetNamespace(), "internal member cluster", internalMemberCluster.GetName())
r.recorder.Event(internalMemberCluster, corev1.EventTypeNormal, eventReasonInternalMemberClusterJoined, "internal member cluster has joined")
joinSucceedCondition := metav1.Condition{
joinedCondition := metav1.Condition{
Type: fleetv1alpha1.ConditionTypeInternalMemberClusterJoin,
Status: metav1.ConditionTrue,
Reason: eventReasonInternalMemberClusterJoined,
ObservedGeneration: internalMemberCluster.GetGeneration(),
}
internalMemberCluster.SetConditions(joinSucceedCondition, utils.ReconcileSuccessCondition())
internalMemberCluster.SetConditions(joinedCondition, utils.ReconcileSuccessCondition())
}

func (r *Reconciler) markInternalMemberClusterLeft(internalMemberCluster apis.ConditionedObj) {
klog.InfoS("mark internal member cluster as left",
"namespace", internalMemberCluster.GetNamespace(), "internal member cluster", internalMemberCluster.GetName())
r.recorder.Event(internalMemberCluster, corev1.EventTypeNormal, eventReasonInternalMemberClusterLeft, "internal member cluster has left")
joinSucceedCondition := metav1.Condition{
leftCondition := metav1.Condition{
Type: fleetv1alpha1.ConditionTypeInternalMemberClusterJoin,
Status: metav1.ConditionFalse,
Reason: eventReasonInternalMemberClusterLeft,
ObservedGeneration: internalMemberCluster.GetGeneration(),
}
internalMemberCluster.SetConditions(joinSucceedCondition, utils.ReconcileSuccessCondition())
internalMemberCluster.SetConditions(leftCondition, utils.ReconcileSuccessCondition())
}

func (r *Reconciler) markInternalMemberClusterUnknown(internalMemberCluster apis.ConditionedObj) {
klog.InfoS("mark internal member cluster join state unknown",
"namespace", internalMemberCluster.GetNamespace(), "internal member cluster", internalMemberCluster.GetName())
r.recorder.Event(internalMemberCluster, corev1.EventTypeNormal, eventReasonInternalMemberClusterUnknown, "internal member cluster join state unknown")
joinUnknownCondition := metav1.Condition{
unknownCondition := metav1.Condition{
Type: fleetv1alpha1.ConditionTypeInternalMemberClusterJoin,
Status: metav1.ConditionUnknown,
Reason: eventReasonInternalMemberClusterUnknown,
ObservedGeneration: internalMemberCluster.GetGeneration(),
}
internalMemberCluster.SetConditions(joinUnknownCondition, utils.ReconcileSuccessCondition())
internalMemberCluster.SetConditions(unknownCondition, utils.ReconcileSuccessCondition())
}

func (r *Reconciler) watchMembershipChan() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/membership/membership_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,13 @@ func (r *Reconciler) markMembershipLeft(membership apis.ConditionedObj) {
klog.InfoS("mark membership left",
"namespace", membership.GetNamespace(), "membership", membership.GetName())
r.recorder.Event(membership, corev1.EventTypeNormal, eventReasonMembershipLeft, "membership left")
joinedCondition := metav1.Condition{
leftCondition := metav1.Condition{
Type: fleetv1alpha1.ConditionTypeMembershipJoin,
Copy link
Contributor

@helayoty helayoty Jun 21, 2022

Choose a reason for hiding this comment

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

We need to use fleetv1alpha1.ConditionTypeMembershipLeave instead

Copy link
Member Author

@minhng22 minhng22 Jun 21, 2022

Choose a reason for hiding this comment

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

There is no fleetv1alpha1.ConditionTypeMembershipLeave.

Copy link
Member Author

@minhng22 minhng22 Jun 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

We use 1 condition type and update the status to reflect the state

fleet/apis/v1alpha1/membership_types.go

Line 60 in 6ec3420

ConditionTypeMembershipJoin string = "Joined"

Status: metav1.ConditionFalse,
Reason: eventReasonMembershipLeft,
ObservedGeneration: membership.GetGeneration(),
}
membership.SetConditions(joinedCondition, utils.ReconcileSuccessCondition())
membership.SetConditions(leftCondition, utils.ReconcileSuccessCondition())
}

// SetupWithManager sets up the controller with the Manager.
Expand Down