🌱 Implement topology validations for topology kubernetes version upgrades #10063

chrischdi · 2024-01-26T16:35:18Z

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #10049
Fixes #9098

/area clusterclass

api/v1beta1/common_types.go

controllers/remote/cluster_cache_tracker.go

webhooks/alias.go

internal/webhooks/cluster.go

chrischdi · 2024-02-07T18:44:46Z

Example error:

                <*errors.StatusError | 0x1400038ac80>: 
                Cluster.cluster.x-k8s.io "cluster1" is invalid: spec.topology.version: Invalid value: "v1.20.2": blocking version update due to MachineDeployment version check: upgrading MachineDeployments: [cluster1-workers1]
                {
                    ErrStatus: {
                        TypeMeta: {Kind: "", APIVersion: ""},
                        ListMeta: {
                            SelfLink: "",
                            ResourceVersion: "",
                            Continue: "",
                            RemainingItemCount: nil,
                        },
                        Status: "Failure",
                        Message: "Cluster.cluster.x-k8s.io \"cluster1\" is invalid: spec.topology.version: Invalid value: \"v1.20.2\": blocking version update due to MachineDeployment version check: upgrading MachineDeployments: [cluster1-workers1]",
                        Reason: "Invalid",
                        Details: {
                            Name: "cluster1",
                            Group: "cluster.x-k8s.io",
                            Kind: "Cluster",
                            UID: "",
                            Causes: [
                                {
                                    Type: "FieldValueInvalid",
                                    Message: "Invalid value: \"v1.20.2\": blocking version update due to MachineDeployment version check: upgrading MachineDeployments: [cluster1-workers1]",
                                    Field: "spec.topology.version",
                                },
                            ],
                            RetryAfterSeconds: 0,
                        },
                        Code: 422,
                    },
                }

chrischdi · 2024-02-08T08:35:27Z

internal/controllers/topology/cluster/scope/state_test.go

@@ -29,92 +29,6 @@ import (
 	"sigs.k8s.io/cluster-api/internal/test/builder"
 )

-func TestIsUpgrading(t *testing.T) {


This tests got moved to internal/topology/check/upgrade_test.go

chrischdi · 2024-02-08T08:35:56Z

internal/controllers/topology/cluster/scope/state.go

@@ -163,22 +137,6 @@ type MachinePoolState struct {
 // IsUpgrading determines if the MachinePool is upgrading.
 // A machine pool is considered upgrading if at least one of the Machines of this
 // MachinePool has a different version.
-func (mp *MachinePoolState) IsUpgrading(ctx context.Context, c client.Client) (bool, error) {
-	// If the MachinePool has no version there is no definitive way to check if it is upgrading. Therefore, return false.


This code got moved to internal/topology/check/upgrade.go

chrischdi · 2024-02-08T08:36:00Z

internal/controllers/topology/cluster/scope/state.go

@@ -101,40 +99,16 @@ type MachineDeploymentState struct {
 // IsUpgrading determines if the MachineDeployment is upgrading.
 // A machine deployment is considered upgrading if at least one of the Machines of this
 // MachineDeployment has a different version.
-func (md *MachineDeploymentState) IsUpgrading(ctx context.Context, c client.Client) (bool, error) {
-	// If the MachineDeployment has no version there is no definitive way to check if it is upgrading. Therefore, return false.


This code got moved to internal/topology/check/upgrade.go

chrischdi · 2024-02-08T08:41:56Z

internal/topology/check/upgrade_test.go

+	}
+}
+
+func TestIsMachinePoolUpgrading(t *testing.T) {


Note: this test did not exist before and we now cover the IsMachinePoolUpgrading function 🎉

internal/webhooks/cluster.go

sbueringer · 2024-02-08T12:46:12Z

Let me know when you're done and I'll take another look (no rush though :))

chrischdi · 2024-02-08T13:09:42Z

@sbueringer should be ready for review now :-)

sbueringer

Very nice work!! Just nits remaining

internal/test/envtest/environment.go

internal/webhooks/cluster.go

internal/webhooks/cluster_test.go

sbueringer · 2024-02-15T14:32:29Z

Thank you!

/lgtm

/assign @fabriziopandini

k8s-ci-robot · 2024-02-15T16:28:52Z

LGTM label has been added.

Git tree hash: 8402f5d3213f70f32c40f7b250886e4abeff03a6

…tter> Sideeffects: * webhooks: add ClusterCacheTrackerReader to the cluster webhook for machine pool validations * Introduce annotation unsafe.topology.cluster.x-k8s.io/disable-version-validation

chrischdi · 2024-02-15T16:53:08Z

Had to rebase due to merge conflict

sbueringer · 2024-02-15T17:04:01Z

/lgtm

k8s-ci-robot · 2024-02-15T17:04:06Z

LGTM label has been added.

Git tree hash: 19db04416730ab0633954e11635a9a434ce8b194

api/v1beta1/common_types.go

internal/webhooks/cluster.go

internal/webhooks/cluster_test.go

main.go

fabriziopandini · 2024-02-20T14:38:26Z

/lgtm
/approve

/hold
for squash

k8s-ci-robot · 2024-02-20T14:38:32Z

LGTM label has been added.

Git tree hash: a971171d6a4ddc20acbeac2655ed2104ea0f6c45

k8s-ci-robot · 2024-02-20T14:38:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [fabriziopandini]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

chrischdi · 2024-02-20T14:39:33Z

Squash should not be required

/hold cancel

fabriziopandini · 2024-02-20T14:39:35Z

let test the squash bot
/hold cancel

chrischdi · 2024-03-26T11:32:03Z

/cherry-pick release-1.6

Due to targeting the experimental ClusterClass feature

k8s-infra-cherrypick-robot · 2024-03-26T11:33:06Z

@chrischdi: new pull request created: #10318

In response to this:

/cherry-pick release-1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-ci-robot added area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 26, 2024

k8s-ci-robot requested review from richardcase and sbueringer January 26, 2024 16:35

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 26, 2024

sbueringer mentioned this pull request Feb 7, 2024

Allow downgrade in cluster.spec.topology.version if machine deployments and controlplane versions have not been upgraded #9098

Closed

sbueringer reviewed Feb 7, 2024

View reviewed changes

chrischdi force-pushed the pr-capi-version-validations branch 2 times, most recently from 6bbb017 to 81d7119 Compare February 7, 2024 17:37

chrischdi force-pushed the pr-capi-version-validations branch 2 times, most recently from bdf09a2 to 41d7f68 Compare February 7, 2024 18:34

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 7, 2024

chrischdi changed the title ~~🌱 [WIP] Implement topology validations for topology kubernetes version upgrades~~ 🌱 Implement topology validations for topology kubernetes version upgrades Feb 8, 2024

chrischdi commented Feb 8, 2024

View reviewed changes

internal/webhooks/cluster.go Outdated Show resolved Hide resolved

chrischdi force-pushed the pr-capi-version-validations branch from 70426f8 to 8dedbd9 Compare February 8, 2024 13:06

sbueringer reviewed Feb 9, 2024

View reviewed changes

chrischdi force-pushed the pr-capi-version-validations branch from 5759ab9 to cac7281 Compare February 15, 2024 12:50

topology: implement version validations (8 days ago) <Christian Schlo…

da4fa22

…tter> Sideeffects: * webhooks: add ClusterCacheTrackerReader to the cluster webhook for machine pool validations * Introduce annotation unsafe.topology.cluster.x-k8s.io/disable-version-validation

chrischdi force-pushed the pr-capi-version-validations branch from 30b41ee to da4fa22 Compare February 15, 2024 16:48

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 15, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 15, 2024

fabriziopandini reviewed Feb 19, 2024

View reviewed changes

review fixes

09f3520

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 20, 2024

k8s-ci-robot requested a review from fabriziopandini February 20, 2024 08:14

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Feb 20, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 20, 2024

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 20, 2024

k8s-ci-robot merged commit 0045baf into kubernetes-sigs:main Feb 20, 2024
22 checks passed

k8s-ci-robot added this to the v1.7 milestone Feb 20, 2024

chrischdi deleted the pr-capi-version-validations branch February 20, 2024 15:01

chrischdi mentioned this pull request Feb 20, 2024

🌱 Add unit tests for MachinePools in topology/scope package #10052

Merged

chrischdi mentioned this pull request Mar 25, 2024

🌱 webhooks: use the alias for ClusterCacheTrackerReader instead of the internal reference #10309

Merged

k8s-infra-cherrypick-robot mentioned this pull request Mar 26, 2024

[release-1.6] 🌱 Implement topology validations for topology kubernetes version upgrades #10318

Merged

sbueringer mentioned this pull request Apr 16, 2024

🚀 Release v1.7.0 #10440

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Implement topology validations for topology kubernetes version upgrades #10063

🌱 Implement topology validations for topology kubernetes version upgrades #10063

chrischdi commented Jan 26, 2024 •

edited by sbueringer

Loading

chrischdi commented Feb 7, 2024

chrischdi Feb 8, 2024

chrischdi Feb 8, 2024

chrischdi Feb 8, 2024

chrischdi Feb 8, 2024

sbueringer commented Feb 8, 2024

chrischdi commented Feb 8, 2024

sbueringer left a comment

sbueringer commented Feb 15, 2024

k8s-ci-robot commented Feb 15, 2024

chrischdi commented Feb 15, 2024

sbueringer commented Feb 15, 2024

k8s-ci-robot commented Feb 15, 2024

fabriziopandini commented Feb 20, 2024

k8s-ci-robot commented Feb 20, 2024

k8s-ci-robot commented Feb 20, 2024

chrischdi commented Feb 20, 2024

fabriziopandini commented Feb 20, 2024

chrischdi commented Mar 26, 2024 •

edited

Loading

k8s-infra-cherrypick-robot commented Mar 26, 2024

🌱 Implement topology validations for topology kubernetes version upgrades #10063

🌱 Implement topology validations for topology kubernetes version upgrades #10063

Conversation

chrischdi commented Jan 26, 2024 • edited by sbueringer Loading

chrischdi commented Feb 7, 2024

chrischdi Feb 8, 2024

Choose a reason for hiding this comment

chrischdi Feb 8, 2024

Choose a reason for hiding this comment

chrischdi Feb 8, 2024

Choose a reason for hiding this comment

chrischdi Feb 8, 2024

Choose a reason for hiding this comment

sbueringer commented Feb 8, 2024

chrischdi commented Feb 8, 2024

sbueringer left a comment

Choose a reason for hiding this comment

sbueringer commented Feb 15, 2024

k8s-ci-robot commented Feb 15, 2024

chrischdi commented Feb 15, 2024

sbueringer commented Feb 15, 2024

k8s-ci-robot commented Feb 15, 2024

fabriziopandini commented Feb 20, 2024

k8s-ci-robot commented Feb 20, 2024

k8s-ci-robot commented Feb 20, 2024

chrischdi commented Feb 20, 2024

fabriziopandini commented Feb 20, 2024

chrischdi commented Mar 26, 2024 • edited Loading

k8s-infra-cherrypick-robot commented Mar 26, 2024

chrischdi commented Jan 26, 2024 •

edited by sbueringer

Loading

chrischdi commented Mar 26, 2024 •

edited

Loading