Skip to content

Commit 6f3e972

Browse files
authored
fix: use the mc generation when copying the agentStatus (#378)
Signed-off-by: Zhiying Lin <[email protected]>
1 parent 7bbc6fe commit 6f3e972

File tree

2 files changed

+196
-115
lines changed

2 files changed

+196
-115
lines changed

pkg/controllers/membercluster/v1beta1/membercluster_controller.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,18 @@ func (r *Reconciler) syncInternalMemberClusterStatus(imc *clusterv1beta1.Interna
515515
}
516516

517517
// TODO: We didn't handle condition type: clusterv1beta1.ConditionTypeMemberClusterHealthy.
518-
// Copy Agent status.
519-
mc.Status.AgentStatus = imc.Status.AgentStatus
518+
// Copy Agent status and set ObservedGeneration for agent conditions.
519+
if len(imc.Status.AgentStatus) > 0 {
520+
mc.Status.AgentStatus = make([]clusterv1beta1.AgentStatus, len(imc.Status.AgentStatus))
521+
}
522+
for i := range imc.Status.AgentStatus {
523+
mc.Status.AgentStatus[i] = *imc.Status.AgentStatus[i].DeepCopy()
524+
// Set ObservedGeneration for each agent condition.
525+
for j := range mc.Status.AgentStatus[i].Conditions {
526+
mc.Status.AgentStatus[i].Conditions[j].ObservedGeneration = mc.GetGeneration()
527+
}
528+
}
529+
520530
r.aggregateJoinedCondition(mc)
521531
// Copy resource usages.
522532
mc.Status.ResourceUsage = imc.Status.ResourceUsage

0 commit comments

Comments
 (0)