Skip to content

Commit ac61652

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #11435 from sbueringer/pr-fix-messages
🌱 Fix messages of conditions used for summaries and aggregations
2 parents dc54e73 + 12c388a commit ac61652

File tree

9 files changed

+69
-54
lines changed

9 files changed

+69
-54
lines changed

‎controlplane/kubeadm/internal/controllers/status.go

+10-8
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,10 @@ func setInitializedCondition(_ context.Context, kcp *controlplanev1.KubeadmContr
212212
func setScalingUpCondition(_ context.Context, kcp *controlplanev1.KubeadmControlPlane, machines collections.Machines, infrastructureObjectNotFound bool, preflightChecks internal.PreflightCheckResults) {
213213
if kcp.Spec.Replicas == nil {
214214
v1beta2conditions.Set(kcp, metav1.Condition{
215-
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
216-
Status: metav1.ConditionUnknown,
217-
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
215+
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
216+
Status: metav1.ConditionUnknown,
217+
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
218+
Message: "Waiting for spec.replicas set",
218219
})
219220
return
220221
}
@@ -263,9 +264,10 @@ func setScalingUpCondition(_ context.Context, kcp *controlplanev1.KubeadmControl
263264
func setScalingDownCondition(_ context.Context, kcp *controlplanev1.KubeadmControlPlane, machines collections.Machines, preflightChecks internal.PreflightCheckResults) {
264265
if kcp.Spec.Replicas == nil {
265266
v1beta2conditions.Set(kcp, metav1.Condition{
266-
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
267-
Status: metav1.ConditionUnknown,
268-
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
267+
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
268+
Status: metav1.ConditionUnknown,
269+
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
270+
Message: "Waiting for spec.replicas set",
269271
})
270272
return
271273
}
@@ -685,11 +687,11 @@ func getPreflightMessages(preflightChecks internal.PreflightCheckResults) []stri
685687
}
686688

687689
if preflightChecks.ControlPlaneComponentsNotHealthy {
688-
additionalMessages = append(additionalMessages, "* waiting for control plane components to be healthy")
690+
additionalMessages = append(additionalMessages, "* waiting for control plane components to become healthy")
689691
}
690692

691693
if preflightChecks.EtcdClusterNotHealthy {
692-
additionalMessages = append(additionalMessages, "* waiting for etcd cluster to be healthy")
694+
additionalMessages = append(additionalMessages, "* waiting for etcd cluster to become healthy")
693695
}
694696
return additionalMessages
695697
}

‎controlplane/kubeadm/internal/controllers/status_test.go

+12-10
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,10 @@ func Test_setScalingUpCondition(t *testing.T) {
133133
KCP: &controlplanev1.KubeadmControlPlane{},
134134
},
135135
expectCondition: metav1.Condition{
136-
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
137-
Status: metav1.ConditionUnknown,
138-
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
136+
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
137+
Status: metav1.ConditionUnknown,
138+
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
139+
Message: "Waiting for spec.replicas set",
139140
},
140141
},
141142
{
@@ -264,8 +265,8 @@ func Test_setScalingUpCondition(t *testing.T) {
264265
Reason: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Reason,
265266
Message: "Scaling up from 3 to 5 replicas is blocked because:\n" +
266267
"* waiting for a control plane Machine to complete deletion\n" +
267-
"* waiting for control plane components to be healthy\n" +
268-
"* waiting for etcd cluster to be healthy",
268+
"* waiting for control plane components to become healthy\n" +
269+
"* waiting for etcd cluster to become healthy",
269270
},
270271
},
271272
}
@@ -294,9 +295,10 @@ func Test_setScalingDownCondition(t *testing.T) {
294295
KCP: &controlplanev1.KubeadmControlPlane{},
295296
},
296297
expectCondition: metav1.Condition{
297-
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
298-
Status: metav1.ConditionUnknown,
299-
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
298+
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
299+
Status: metav1.ConditionUnknown,
300+
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
301+
Message: "Waiting for spec.replicas set",
300302
},
301303
},
302304
{
@@ -429,8 +431,8 @@ func Test_setScalingDownCondition(t *testing.T) {
429431
Reason: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Reason,
430432
Message: "Scaling down from 3 to 1 replicas is blocked because:\n" +
431433
"* waiting for a control plane Machine to complete deletion\n" +
432-
"* waiting for control plane components to be healthy\n" +
433-
"* waiting for etcd cluster to be healthy",
434+
"* waiting for control plane components to become healthy\n" +
435+
"* waiting for etcd cluster to become healthy",
434436
},
435437
},
436438
}

‎internal/controllers/cluster/cluster_controller_status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ func setControlPlaneInitializedCondition(ctx context.Context, cluster *clusterv1
508508
Type: clusterv1.ClusterControlPlaneInitializedV1Beta2Condition,
509509
Status: metav1.ConditionFalse,
510510
Reason: clusterv1.ClusterControlPlaneNotInitializedV1Beta2Reason,
511-
Message: fmt.Sprintf("Waiting for the %s to have status.initialized set to true", cluster.Spec.ControlPlaneRef.Kind),
511+
Message: "Control plane not yet initialized",
512512
})
513513
return
514514
}

‎internal/controllers/cluster/cluster_controller_status_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ func TestSetControlPlaneInitialized(t *testing.T) {
603603
Type: clusterv1.ClusterControlPlaneInitializedV1Beta2Condition,
604604
Status: metav1.ConditionFalse,
605605
Reason: clusterv1.ClusterControlPlaneNotInitializedV1Beta2Reason,
606-
Message: "Waiting for the FakeControlPlane to have status.initialized set to true",
606+
Message: "Control plane not yet initialized",
607607
},
608608
},
609609
{

‎internal/controllers/machinedeployment/machinedeployment_status.go

+16-12
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,21 @@ func setAvailableCondition(_ context.Context, machineDeployment *clusterv1.Machi
104104
// Surface if .spec.replicas is not yet set (this should never happen).
105105
if machineDeployment.Spec.Replicas == nil {
106106
v1beta2conditions.Set(machineDeployment, metav1.Condition{
107-
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
108-
Status: metav1.ConditionUnknown,
109-
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
107+
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
108+
Status: metav1.ConditionUnknown,
109+
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
110+
Message: "Waiting for spec.replicas set",
110111
})
111112
return
112113
}
113114

114115
// Surface if .status.v1beta2.availableReplicas is not yet set.
115116
if machineDeployment.Status.V1Beta2 == nil || machineDeployment.Status.V1Beta2.AvailableReplicas == nil {
116117
v1beta2conditions.Set(machineDeployment, metav1.Condition{
117-
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
118-
Status: metav1.ConditionUnknown,
119-
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
118+
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
119+
Status: metav1.ConditionUnknown,
120+
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
121+
Message: "Waiting for status.v1beta2.availableReplicas set",
120122
})
121123
return
122124
}
@@ -160,9 +162,10 @@ func setScalingUpCondition(_ context.Context, machineDeployment *clusterv1.Machi
160162
// Surface if .spec.replicas is not yet set (this should never happen).
161163
if machineDeployment.Spec.Replicas == nil {
162164
v1beta2conditions.Set(machineDeployment, metav1.Condition{
163-
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
164-
Status: metav1.ConditionUnknown,
165-
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
165+
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
166+
Status: metav1.ConditionUnknown,
167+
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
168+
Message: "Waiting for spec.replicas set",
166169
})
167170
return
168171
}
@@ -218,9 +221,10 @@ func setScalingDownCondition(_ context.Context, machineDeployment *clusterv1.Mac
218221
// Surface if .spec.replicas is not yet set (this should never happen).
219222
if machineDeployment.Spec.Replicas == nil {
220223
v1beta2conditions.Set(machineDeployment, metav1.Condition{
221-
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
222-
Status: metav1.ConditionUnknown,
223-
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
224+
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
225+
Status: metav1.ConditionUnknown,
226+
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
227+
Message: "Waiting for spec.replicas set",
224228
})
225229
return
226230
}

‎internal/controllers/machinedeployment/machinedeployment_status_test.go

+16-12
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,10 @@ func Test_setAvailableCondition(t *testing.T) {
105105
machineDeployment: &clusterv1.MachineDeployment{},
106106
getAndAdoptMachineSetsForDeploymentSucceeded: true,
107107
expectCondition: metav1.Condition{
108-
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
109-
Status: metav1.ConditionUnknown,
110-
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
108+
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
109+
Status: metav1.ConditionUnknown,
110+
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
111+
Message: "Waiting for spec.replicas set",
111112
},
112113
},
113114
{
@@ -117,9 +118,10 @@ func Test_setAvailableCondition(t *testing.T) {
117118
},
118119
getAndAdoptMachineSetsForDeploymentSucceeded: true,
119120
expectCondition: metav1.Condition{
120-
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
121-
Status: metav1.ConditionUnknown,
122-
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
121+
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
122+
Status: metav1.ConditionUnknown,
123+
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
124+
Message: "Waiting for status.v1beta2.availableReplicas set",
123125
},
124126
},
125127
{
@@ -266,9 +268,10 @@ func Test_setScalingUpCondition(t *testing.T) {
266268
infrastructureTemplateNotFound: false,
267269
getAndAdoptMachineSetsForDeploymentSucceeded: true,
268270
expectCondition: metav1.Condition{
269-
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
270-
Status: metav1.ConditionUnknown,
271-
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
271+
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
272+
Status: metav1.ConditionUnknown,
273+
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
274+
Message: "Waiting for spec.replicas set",
272275
},
273276
},
274277
{
@@ -464,9 +467,10 @@ func Test_setScalingDownCondition(t *testing.T) {
464467
}(),
465468
getAndAdoptMachineSetsForDeploymentSucceeded: true,
466469
expectCondition: metav1.Condition{
467-
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
468-
Status: metav1.ConditionUnknown,
469-
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
470+
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
471+
Status: metav1.ConditionUnknown,
472+
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
473+
Message: "Waiting for spec.replicas set",
470474
},
471475
},
472476
{

‎internal/controllers/machineset/machineset_controller_status.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ func setScalingUpCondition(_ context.Context, ms *clusterv1.MachineSet, machines
107107
// Surface if .spec.replicas is not yet set (this should never happen).
108108
if ms.Spec.Replicas == nil {
109109
v1beta2conditions.Set(ms, metav1.Condition{
110-
Type: clusterv1.MachineSetScalingUpV1Beta2Condition,
111-
Status: metav1.ConditionUnknown,
112-
Reason: clusterv1.MachineSetScalingUpWaitingForReplicasSetV1Beta2Reason,
110+
Type: clusterv1.MachineSetScalingUpV1Beta2Condition,
111+
Status: metav1.ConditionUnknown,
112+
Reason: clusterv1.MachineSetScalingUpWaitingForReplicasSetV1Beta2Reason,
113+
Message: "Waiting for spec.replicas set",
113114
})
114115
return
115116
}
@@ -172,9 +173,10 @@ func setScalingDownCondition(_ context.Context, ms *clusterv1.MachineSet, machin
172173
// Surface if .spec.replicas is not yet set (this should never happen).
173174
if ms.Spec.Replicas == nil {
174175
v1beta2conditions.Set(ms, metav1.Condition{
175-
Type: clusterv1.MachineSetScalingDownV1Beta2Condition,
176-
Status: metav1.ConditionUnknown,
177-
Reason: clusterv1.MachineSetScalingDownWaitingForReplicasSetV1Beta2Reason,
176+
Type: clusterv1.MachineSetScalingDownV1Beta2Condition,
177+
Status: metav1.ConditionUnknown,
178+
Reason: clusterv1.MachineSetScalingDownWaitingForReplicasSetV1Beta2Reason,
179+
Message: "Waiting for spec.replicas set",
178180
})
179181
return
180182
}

‎internal/controllers/topology/cluster/conditions.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
8484
),
8585
)
8686
v1beta2conditions.Set(cluster, metav1.Condition{
87-
Type: clusterv1.ClusterTopologyReconciledV1Beta2Condition,
88-
Status: metav1.ConditionFalse,
89-
Reason: clusterv1.ClusterTopologyReconciledDeletingV1Beta2Reason,
87+
Type: clusterv1.ClusterTopologyReconciledV1Beta2Condition,
88+
Status: metav1.ConditionFalse,
89+
Reason: clusterv1.ClusterTopologyReconciledDeletingV1Beta2Reason,
90+
Message: "Cluster is deleting",
9091
})
9192
return nil
9293
}

‎internal/controllers/topology/cluster/conditions_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ func TestReconcileTopologyReconciledCondition(t *testing.T) {
10191019
wantConditionMessage: "",
10201020
wantV1Beta2ConditionStatus: metav1.ConditionFalse,
10211021
wantV1Beta2ConditionReason: clusterv1.ClusterTopologyReconciledDeletingV1Beta2Reason,
1022-
wantV1Beta2ConditionMessage: "",
1022+
wantV1Beta2ConditionMessage: "Cluster is deleting",
10231023
},
10241024
}
10251025

0 commit comments

Comments
 (0)