✨ Implement core logic for chained upgrades #12726
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -562,6 +562,37 @@ func TestPreflightChecks(t *testing.T) { | |
| TopologyVersionMismatch: true, | ||
| }, | ||
| }, | ||
| { | ||
| name: "control plane with a pending upgrade, but not yet at the current step of the upgrade plan, should requeue", | ||
| cluster: &clusterv1.Cluster{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: map[string]string{ | ||
| clusterv1.ClusterTopologyControlPlaneUpgradeStepAnnotation: "v1.32.0", | ||
| }, | ||
| }, | ||
| Spec: clusterv1.ClusterSpec{ | ||
| Topology: clusterv1.Topology{ | ||
| Version: "v1.33.0", | ||
| }, | ||
| }, | ||
| }, | ||
| kcp: &controlplanev1.KubeadmControlPlane{ | ||
| Spec: controlplanev1.KubeadmControlPlaneSpec{ | ||
| Version: "v1.31.0", | ||
| }, | ||
| }, | ||
| machines: []*clusterv1.Machine{ | ||
| {}, | ||
| }, | ||
|
|
||
| expectResult: ctrl.Result{RequeueAfter: preflightFailedRequeueAfter}, | ||
| expectPreflight: internal.PreflightCheckResults{ | ||
| HasDeletingMachine: false, | ||
| ControlPlaneComponentsNotHealthy: false, | ||
| EtcdClusterNotHealthy: false, | ||
| TopologyVersionMismatch: true, | ||
| }, | ||
| }, | ||
| { | ||
| name: "control plane with a deleting machine should requeue", | ||
| kcp: &controlplanev1.KubeadmControlPlane{}, | ||
|
|
@@ -687,6 +718,55 @@ func TestPreflightChecks(t *testing.T) { | |
| TopologyVersionMismatch: false, | ||
| }, | ||
| }, | ||
| { | ||
| name: "control plane with a pending upgrade, but already at the current step of the upgrade plan, should pass", | ||
| cluster: &clusterv1.Cluster{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Annotations: map[string]string{ | ||
| clusterv1.ClusterTopologyControlPlaneUpgradeStepAnnotation: "v1.32.0", | ||
| }, | ||
| }, | ||
| Spec: clusterv1.ClusterSpec{ | ||
| Topology: clusterv1.Topology{ | ||
| Version: "v1.33.0", | ||
| }, | ||
| }, | ||
| }, | ||
| kcp: &controlplanev1.KubeadmControlPlane{ | ||
| Spec: controlplanev1.KubeadmControlPlaneSpec{ | ||
| Version: "v1.32.0", | ||
| }, Status: controlplanev1.KubeadmControlPlaneStatus{ | ||
| Conditions: []metav1.Condition{ | ||
| {Type: controlplanev1.KubeadmControlPlaneControlPlaneComponentsHealthyCondition, Status: metav1.ConditionTrue}, | ||
| {Type: controlplanev1.KubeadmControlPlaneEtcdClusterHealthyCondition, Status: metav1.ConditionTrue}, | ||
| }, | ||
| }, | ||
| }, | ||
| machines: []*clusterv1.Machine{ | ||
| { | ||
| Status: clusterv1.MachineStatus{ | ||
| NodeRef: clusterv1.MachineNodeReference{ | ||
| Name: "node-1", | ||
| }, | ||
| Conditions: []metav1.Condition{ | ||
| {Type: controlplanev1.KubeadmControlPlaneMachineAPIServerPodHealthyCondition, Status: metav1.ConditionTrue}, | ||
| {Type: controlplanev1.KubeadmControlPlaneMachineControllerManagerPodHealthyCondition, Status: metav1.ConditionTrue}, | ||
| {Type: controlplanev1.KubeadmControlPlaneMachineSchedulerPodHealthyCondition, Status: metav1.ConditionTrue}, | ||
| {Type: controlplanev1.KubeadmControlPlaneMachineEtcdPodHealthyCondition, Status: metav1.ConditionTrue}, | ||
| {Type: controlplanev1.KubeadmControlPlaneMachineEtcdMemberHealthyCondition, Status: metav1.ConditionTrue}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
||
| expectResult: ctrl.Result{}, | ||
| expectPreflight: internal.PreflightCheckResults{ | ||
| HasDeletingMachine: false, | ||
| ControlPlaneComponentsNotHealthy: false, | ||
| EtcdClusterNotHealthy: false, | ||
| TopologyVersionMismatch: false, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range testCases { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a bit of a mismatch between const name, godoc and annotation key
Should this be:
topology.cluster.x-k8s.io/upgrade-step-control-plane-version? (+ const name should then be aligned accordinglyLet's document the annotation in docs/book/src/reference/api/labels-and-annotations.md
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer to not surface implementations details, and establish a pattern where we should add internal. prefix to annotations that are meant to be used by CAPI only
e.g internal.topology.cluster.x-k8s.io/upgrade would be described as "This is an annotation used by CAPI internally to track upgrade steps. Name, meaning and semantics of annotation can change anytime and it should not be used outside of CAPI controllers.".
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm fine with adding internal, but maybe it would be still good to have a name that tells us what it exactly contains. Or we could json marshal that context into the value, but that's never fun :/
(also will be more helpful during troubleshooting)