Skip to content

🌱 Fix messages of conditions used for summaries and aggregations #11435

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
merged 1 commit into from
Nov 19, 2024
Merged

🌱 Fix messages of conditions used for summaries and aggregations #11435

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
18 changes: 10 additions & 8 deletions controlplane/kubeadm/internal/controllers/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,10 @@ func setInitializedCondition(_ context.Context, kcp *controlplanev1.KubeadmContr
func setScalingUpCondition(_ context.Context, kcp *controlplanev1.KubeadmControlPlane, machines collections.Machines, infrastructureObjectNotFound bool, preflightChecks internal.PreflightCheckResults) {
if kcp.Spec.Replicas == nil {
v1beta2conditions.Set(kcp, metav1.Condition{
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}
Expand Down Expand Up @@ -263,9 +264,10 @@ func setScalingUpCondition(_ context.Context, kcp *controlplanev1.KubeadmControl
func setScalingDownCondition(_ context.Context, kcp *controlplanev1.KubeadmControlPlane, machines collections.Machines, preflightChecks internal.PreflightCheckResults) {
if kcp.Spec.Replicas == nil {
v1beta2conditions.Set(kcp, metav1.Condition{
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}
Expand Down Expand Up @@ -685,11 +687,11 @@ func getPreflightMessages(preflightChecks internal.PreflightCheckResults) []stri
}

if preflightChecks.ControlPlaneComponentsNotHealthy {
additionalMessages = append(additionalMessages, "* waiting for control plane components to be healthy")
additionalMessages = append(additionalMessages, "* waiting for control plane components to become healthy")
}

if preflightChecks.EtcdClusterNotHealthy {
additionalMessages = append(additionalMessages, "* waiting for etcd cluster to be healthy")
additionalMessages = append(additionalMessages, "* waiting for etcd cluster to become healthy")
}
return additionalMessages
}
Expand Down
22 changes: 12 additions & 10 deletions controlplane/kubeadm/internal/controllers/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ func Test_setScalingUpCondition(t *testing.T) {
KCP: &controlplanev1.KubeadmControlPlane{},
},
expectCondition: metav1.Condition{
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
Type: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingUpWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
},
},
{
Expand Down Expand Up @@ -264,8 +265,8 @@ func Test_setScalingUpCondition(t *testing.T) {
Reason: controlplanev1.KubeadmControlPlaneScalingUpV1Beta2Reason,
Message: "Scaling up from 3 to 5 replicas is blocked because:\n" +
"* waiting for a control plane Machine to complete deletion\n" +
"* waiting for control plane components to be healthy\n" +
"* waiting for etcd cluster to be healthy",
"* waiting for control plane components to become healthy\n" +
"* waiting for etcd cluster to become healthy",
},
},
}
Expand Down Expand Up @@ -294,9 +295,10 @@ func Test_setScalingDownCondition(t *testing.T) {
KCP: &controlplanev1.KubeadmControlPlane{},
},
expectCondition: metav1.Condition{
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
Type: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: controlplanev1.KubeadmControlPlaneScalingDownWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
},
},
{
Expand Down Expand Up @@ -429,8 +431,8 @@ func Test_setScalingDownCondition(t *testing.T) {
Reason: controlplanev1.KubeadmControlPlaneScalingDownV1Beta2Reason,
Message: "Scaling down from 3 to 1 replicas is blocked because:\n" +
"* waiting for a control plane Machine to complete deletion\n" +
"* waiting for control plane components to be healthy\n" +
"* waiting for etcd cluster to be healthy",
"* waiting for control plane components to become healthy\n" +
"* waiting for etcd cluster to become healthy",
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/cluster/cluster_controller_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ func setControlPlaneInitializedCondition(ctx context.Context, cluster *clusterv1
Type: clusterv1.ClusterControlPlaneInitializedV1Beta2Condition,
Status: metav1.ConditionFalse,
Reason: clusterv1.ClusterControlPlaneNotInitializedV1Beta2Reason,
Message: fmt.Sprintf("Waiting for the %s to have status.initialized set to true", cluster.Spec.ControlPlaneRef.Kind),
Message: "Control plane not yet initialized",
})
return
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/cluster/cluster_controller_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ func TestSetControlPlaneInitialized(t *testing.T) {
Type: clusterv1.ClusterControlPlaneInitializedV1Beta2Condition,
Status: metav1.ConditionFalse,
Reason: clusterv1.ClusterControlPlaneNotInitializedV1Beta2Reason,
Message: "Waiting for the FakeControlPlane to have status.initialized set to true",
Message: "Control plane not yet initialized",
},
},
{
Expand Down
28 changes: 16 additions & 12 deletions internal/controllers/machinedeployment/machinedeployment_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,21 @@ func setAvailableCondition(_ context.Context, machineDeployment *clusterv1.Machi
// Surface if .spec.replicas is not yet set (this should never happen).
if machineDeployment.Spec.Replicas == nil {
v1beta2conditions.Set(machineDeployment, metav1.Condition{
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}

// Surface if .status.v1beta2.availableReplicas is not yet set.
if machineDeployment.Status.V1Beta2 == nil || machineDeployment.Status.V1Beta2.AvailableReplicas == nil {
v1beta2conditions.Set(machineDeployment, metav1.Condition{
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
Message: "Waiting for status.v1beta2.availableReplicas set",
})
return
}
Expand Down Expand Up @@ -160,9 +162,10 @@ func setScalingUpCondition(_ context.Context, machineDeployment *clusterv1.Machi
// Surface if .spec.replicas is not yet set (this should never happen).
if machineDeployment.Spec.Replicas == nil {
v1beta2conditions.Set(machineDeployment, metav1.Condition{
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}
Expand Down Expand Up @@ -218,9 +221,10 @@ func setScalingDownCondition(_ context.Context, machineDeployment *clusterv1.Mac
// Surface if .spec.replicas is not yet set (this should never happen).
if machineDeployment.Spec.Replicas == nil {
v1beta2conditions.Set(machineDeployment, metav1.Condition{
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}
Expand Down
28 changes: 16 additions & 12 deletions internal/controllers/machinedeployment/machinedeployment_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,10 @@ func Test_setAvailableCondition(t *testing.T) {
machineDeployment: &clusterv1.MachineDeployment{},
getAndAdoptMachineSetsForDeploymentSucceeded: true,
expectCondition: metav1.Condition{
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
},
},
{
Expand All @@ -117,9 +118,10 @@ func Test_setAvailableCondition(t *testing.T) {
},
getAndAdoptMachineSetsForDeploymentSucceeded: true,
expectCondition: metav1.Condition{
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentAvailableV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentAvailableWaitingForAvailableReplicasSetV1Beta2Reason,
Message: "Waiting for status.v1beta2.availableReplicas set",
},
},
{
Expand Down Expand Up @@ -266,9 +268,10 @@ func Test_setScalingUpCondition(t *testing.T) {
infrastructureTemplateNotFound: false,
getAndAdoptMachineSetsForDeploymentSucceeded: true,
expectCondition: metav1.Condition{
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingUpWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
},
},
{
Expand Down Expand Up @@ -464,9 +467,10 @@ func Test_setScalingDownCondition(t *testing.T) {
}(),
getAndAdoptMachineSetsForDeploymentSucceeded: true,
expectCondition: metav1.Condition{
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineDeploymentScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineDeploymentScalingDownWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
},
},
{
Expand Down
14 changes: 8 additions & 6 deletions internal/controllers/machineset/machineset_controller_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ func setScalingUpCondition(_ context.Context, ms *clusterv1.MachineSet, machines
// Surface if .spec.replicas is not yet set (this should never happen).
if ms.Spec.Replicas == nil {
v1beta2conditions.Set(ms, metav1.Condition{
Type: clusterv1.MachineSetScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineSetScalingUpWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineSetScalingUpV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineSetScalingUpWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}
Expand Down Expand Up @@ -172,9 +173,10 @@ func setScalingDownCondition(_ context.Context, ms *clusterv1.MachineSet, machin
// Surface if .spec.replicas is not yet set (this should never happen).
if ms.Spec.Replicas == nil {
v1beta2conditions.Set(ms, metav1.Condition{
Type: clusterv1.MachineSetScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineSetScalingDownWaitingForReplicasSetV1Beta2Reason,
Type: clusterv1.MachineSetScalingDownV1Beta2Condition,
Status: metav1.ConditionUnknown,
Reason: clusterv1.MachineSetScalingDownWaitingForReplicasSetV1Beta2Reason,
Message: "Waiting for spec.replicas set",
})
return
}
Expand Down
7 changes: 4 additions & 3 deletions internal/controllers/topology/cluster/conditions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
),
)
v1beta2conditions.Set(cluster, metav1.Condition{
Type: clusterv1.ClusterTopologyReconciledV1Beta2Condition,
Status: metav1.ConditionFalse,
Reason: clusterv1.ClusterTopologyReconciledDeletingV1Beta2Reason,
Type: clusterv1.ClusterTopologyReconciledV1Beta2Condition,
Status: metav1.ConditionFalse,
Reason: clusterv1.ClusterTopologyReconciledDeletingV1Beta2Reason,
Message: "Cluster is deleting",
})
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/topology/cluster/conditions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ func TestReconcileTopologyReconciledCondition(t *testing.T) {
wantConditionMessage: "",
wantV1Beta2ConditionStatus: metav1.ConditionFalse,
wantV1Beta2ConditionReason: clusterv1.ClusterTopologyReconciledDeletingV1Beta2Reason,
wantV1Beta2ConditionMessage: "",
wantV1Beta2ConditionMessage: "Cluster is deleting",
},
}

Expand Down