Merge pull request #11447 from sbueringer/pr-kcp-pod-msg-fix

k8s-ci-robot · web-flow · commit 48274182354f · 2024-11-19T19:26:53.000Z
🌱 KCP: Change Pod does not exist message to allow aggregation
diff --git a/controlplane/kubeadm/internal/workload_cluster_conditions.go b/controlplane/kubeadm/internal/workload_cluster_conditions.go
@@ -655,7 +655,7 @@ func (w *Workload) updateStaticPodCondition(ctx context.Context, machine *cluste
 				Type:    staticPodV1beta2Condition,
 				Status:  metav1.ConditionFalse,
 				Reason:  controlplanev1.KubeadmControlPlaneMachinePodDoesNotExistV1Beta2Reason,
-				Message: fmt.Sprintf("Pod %s does not exist", podKey.Name),
+				Message: "Pod does not exist",
 			})
 			return
 		}
diff --git a/controlplane/kubeadm/internal/workload_cluster_conditions_test.go b/controlplane/kubeadm/internal/workload_cluster_conditions_test.go
@@ -1193,7 +1193,7 @@ func TestUpdateStaticPodCondition(t *testing.T) {
 				Type:    v1beta2Condition,
 				Status:  metav1.ConditionFalse,
 				Reason:  controlplanev1.KubeadmControlPlaneMachinePodDoesNotExistV1Beta2Reason,
-				Message: "Pod kube-component-node does not exist",
+				Message: "Pod does not exist",
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ func (w Workload) updateStaticPodCondition(ctx context.Context, machine cluste`
`655`	`655`	`Type: staticPodV1beta2Condition,`
`656`	`656`	`Status: metav1.ConditionFalse,`
`657`	`657`	`Reason: controlplanev1.KubeadmControlPlaneMachinePodDoesNotExistV1Beta2Reason,`
`658`		`- Message: fmt.Sprintf("Pod %s does not exist", podKey.Name),`
	`658`	`+ Message: "Pod does not exist",`
`659`	`659`	`})`
`660`	`660`	`return`
`661`	`661`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1193,7 +1193,7 @@ func TestUpdateStaticPodCondition(t *testing.T) {`
`1193`	`1193`	`Type: v1beta2Condition,`
`1194`	`1194`	`Status: metav1.ConditionFalse,`
`1195`	`1195`	`Reason: controlplanev1.KubeadmControlPlaneMachinePodDoesNotExistV1Beta2Reason,`
`1196`		`- Message: "Pod kube-component-node does not exist",`
	`1196`	`+ Message: "Pod does not exist",`
`1197`	`1197`	`},`
`1198`	`1198`	`},`
`1199`	`1199`	`{`