🌱 Bump CAPI to v1.11 and k8s to v1.33 (#5720)

* deps: upgrade Kubernetes dependencies to v0.33.4

- Update core Kubernetes dependencies from v0.32.3 to v0.33.4:
  - k8s.io/api, k8s.io/apimachinery, k8s.io/client-go
  - k8s.io/apiserver, k8s.io/cli-runtime, k8s.io/kubectl
  - k8s.io/apiextensions-apiserver, k8s.io/component-base
- Upgrade prometheus/client_golang from v1.19.1 to v1.22.0
- Update cel.dev/expr from v0.18.0 to v0.19.1
- Upgrade google/cel-go from v0.22.0 to v0.23.2
- Update golang.org/x/time from v0.8.0 to v0.9.0
- Upgrade gRPC from v1.67.3 to v1.68.1
- Update OpenTelemetry packages to v1.33.0
- Refresh k8s.io/utils and other indirect dependencies
- Update kube-openapi and structured-merge-diff versions

* deps: update cluster-api to v1.11.1 and controller-runtime to v0.21.0

- Upgrade cluster-api from v1.10.2 to v1.11.1
- Upgrade controller-runtime from v0.20.4 to v0.21.0
- Update various golang.org/x/* packages
- Update testing dependencies (ginkgo, gomega)
- Update OpenTelemetry and other indirect dependencies

* WIP no IDE errors

* WIP IDE Errors

* Fix go dependencies

Signed-off-by: Borja Clemente <[email protected]>

* Update imports, code and generations to CAPI 1.11

- Update all imports to v1beta2 types except for conditions staying in
  v1beta1.
- Adapt source code to work with v1beta2 and deprecated conditions.
- Manually update conversions.

Signed-off-by: Borja Clemente <[email protected]>

* Update linting pkg alias and fix broken imports blocks

Signed-off-by: Borja Clemente <[email protected]>

* Remove unnecessary Paused constants

Signed-off-by: Borja Clemente <[email protected]>

* Fix import aliases

Signed-off-by: Borja Clemente <[email protected]>

* Fix broken imports

Signed-off-by: Borja Clemente <[email protected]>

* Revert public APIS back to v1beta1 while internally using v1beta2

Introducing v1beta2 on public types is a breaking change so they have to
stay in v1beta1. Internally though, migration to v1beta2 is happening
(except for conditions).

Signed-off-by: Borja Clemente <[email protected]>

* Revert infrav1 conditions to v1beta1 and consolidate imports

Signed-off-by: Borja Clemente <[email protected]>

* Consolidate conditions imports and fix linting

Signed-off-by: Borja Clemente <[email protected]>

* Fix regression in machine deployments without failure domain set

Signed-off-by: Borja Clemente <[email protected]>

* Revert missing public APIs to v1beta1

Signed-off-by: Borja Clemente <[email protected]>

* Consolidate infrav1beta1 imports into infrav1

Signed-off-by: Borja Clemente <[email protected]>

* Remove unused conditions constants

Signed-off-by: Borja Clemente <[email protected]>

* Fix setting wrong condition type

Signed-off-by: Borja Clemente <[email protected]>

* Cast v1beta1 conditions instead of creating a new constant

Signed-off-by: Borja Clemente <[email protected]>

* Revert changed public APIs and adapt internally to v1beta2

Signed-off-by: Borja Clemente <[email protected]>

* Resolve conflicts with main

Signed-off-by: Borja Clemente <[email protected]>

* Add deprecated CAPI imports linter rule

Add rule to allow using deprecated v1beta1 CAPI APIs and removed linter
comments everywhere.

Signed-off-by: Borja Clemente <[email protected]>

* Apply review corrections

Signed-off-by: Borja Clemente <[email protected]>

* Adjust e2e and metadata versions

Signed-off-by: Borja Clemente <[email protected]>

* Apply review feedback on awscluster_webhook

Signed-off-by: Borja Clemente <[email protected]>

* FIx unit tests

Signed-off-by: Borja Clemente <[email protected]>

* Review feedback

Signed-off-by: Borja Clemente <[email protected]>

* Apply review feedback

Signed-off-by: Borja Clemente <[email protected]>

* Add CRD RBAC to the awsmachine controller

Signed-off-by: Borja Clemente <[email protected]>

* e2e: add v1beta1 CAPI scheme to clients and adjust modifyFunc test to use the new field name

* Fix linting issues

Signed-off-by: Borja Clemente <[email protected]>

* Fix nodeDrainTimeoutSeconds field in clusterclass test

Signed-off-by: Borja Clemente <[email protected]>

* e2e: fix contract for CAPI

* fix path again

* e2e: fix contract for capa 9.99.99 (#3)

* e2e: use correct type for setting field (#4)

* rosa: deflake unit test (#5)

* rosa: deflake unit test

* fixup

* e2e: fix config metadata and contract version pinning (#6)

* e2e: fix config metadata file path

Signed-off-by: Borja Clemente <[email protected]>

* Bump KCP Template for clusterclass changes (#7)

---------

Signed-off-by: Borja Clemente <[email protected]>
Co-authored-by: Bryan Cox <[email protected]>
Co-authored-by: Christian Schlotter <[email protected]>

Author: 3 people

.golangci.yml

@@ -139,8 +139,6 @@ linters:
           alias: runtimeserializer
         - pkg: k8s.io/apimachinery/pkg/runtime/serializer/yaml
           alias: yamlserializer
-        - pkg: sigs.k8s.io/cluster-api/api/v1beta1
-          alias: clusterv1
         - pkg: sigs.k8s.io/cluster-api/util/defaulting
           alias: utildefaulting
         - pkg: sigs.k8s.io/controller-runtime
@@ -169,8 +167,14 @@ linters:
           alias: crclient
         - pkg: k8s.io/apimachinery/pkg/types
           alias: apimachinerytypes
-        - pkg: sigs.k8s.io/cluster-api/exp/api/v1beta1
-          alias: expclusterv1
+        - pkg: "sigs.k8s.io/cluster-api/api/core/v1beta2"
+          alias: clusterv1
+        - pkg: "sigs.k8s.io/cluster-api/api/core/v1beta1"
+          alias: clusterv1beta1
+        - pkg: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
+          alias: v1beta1patch
+        - pkg: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
+          alias: v1beta1conditions
       no-unaliased: false
     nolintlint:
       require-specific: true
@@ -212,16 +216,16 @@ linters:
       #   - errcheck
       #   text: Error return value of `outputPrinter.Print` is not checked
       - linters:
-        - gosec
-        text: 'G103: Use of unsafe calls should be audited'
+          - gosec
+        text: "G103: Use of unsafe calls should be audited"
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
       - linters:
           - staticcheck
-        text: 'QF1008: could remove embedded field .*'
+        text: "QF1008: could remove embedded field .*"
       # TODO: change to use time.Time.Equal
       - linters:
           - staticcheck
-        text: 'QF1009: probably want to use time.Time.Equal instead'
+        text: "QF1009: probably want to use time.Time.Equal instead"
       - linters:
           - revive
         # Ignoring stylistic checks for generated code
@@ -233,13 +237,13 @@ linters:
         # Ignoring stylistic checks for generated code
         path: .*(api|types)\/.*\/.*conversion.*\.go$
         # By convention, receiver names in a method should reflect their identity.
-        text: 'receiver-naming: receiver name (.+) should be consistent with previous receiver name (.+)'
+        text: "receiver-naming: receiver name (.+) should be consistent with previous receiver name (.+)"
       - linters:
           - revive
         # Ignoring stylistic checks for generated code
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
         # Checking if an error is nil to just after return the error or nil is redundant
-        text: 'if-return: redundant if ...; err != nil check, just return error instead'
+        text: "if-return: redundant if ...; err != nil check, just return error instead"
       - linters:
           - revive
         text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'
@@ -268,7 +272,7 @@ linters:
         text: Error return value of (.+) is not checked
       - linters:
           - gosec
-        text: 'G108: Profiling endpoint is automatically exposed on /debug/pprof'
+        text: "G108: Profiling endpoint is automatically exposed on /debug/pprof"
       - linters:
           - godot
         path: (.*)/(v1beta1|v1beta2)/(.*)types.go
@@ -282,17 +286,17 @@ linters:
       - linters:
           - revive
         path: .*/defaults.go
-        text: 'var-naming: don''t use underscores in Go names; func (.+) should be (.+)'
+        text: "var-naming: don't use underscores in Go names; func (.+) should be (.+)"
       - linters:
           - revive
         path: .*/.*(mock|gc_).*/.+\.go
-        text: 'var-naming: don''t use an underscore in package name'
+        text: "var-naming: don't use an underscore in package name"
       - linters:
           - revive
         # Ignoring stylistic checks for generated code
         path: .*(api|types|test)\/.*\/.*conversion.*\.go$
         # This rule warns when initialism, variable or package naming conventions are not followed.
-        text: 'var-naming: don''t use underscores in Go names'
+        text: "var-naming: don't use underscores in Go names"
       - linters:
           - unparam
         text: always receives
@@ -309,20 +313,23 @@ linters:
         text: cyclomatic complexity
       - linters:
           - gocritic
-        text: 'appendAssign: append result not assigned to the same slice'
+        text: "appendAssign: append result not assigned to the same slice"
       - path: (.+)\.go$
         text: (Expect directory permissions to be 0750 or less|Expect file permissions to be 0600 or less)
       - path: (.+)\.go$
-        text: 'exported: (func|type) name will be used as (.+) by other packages, and that stutters; consider calling this (.+)'
+        text: "exported: (func|type) name will be used as (.+) by other packages, and that stutters; consider calling this (.+)"
       - path: (.+)\.go$
         text: (G104|G107|G404|G505|ST1000)
       - path: (.+)\.go$
-        text: 'G108: Profiling endpoint is automatically exposed on /debug/pprof'
+        text: "G108: Profiling endpoint is automatically exposed on /debug/pprof"
       - path: (.+)\.go$
         text: net/http.Get must not be called
       - linters:
           - goconst
         path: (.+)_test\.go
+      - linters:
+          - staticcheck
+        text: 'SA1019: "sigs.k8s.io/cluster-api/(.*)" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.'
     paths:
       - third_party$
       - builtin$

Makefile

@@ -205,7 +205,7 @@ endif
 .PHONY: defaulters
 defaulters: $(DEFAULTER_GEN) ## Generate all Go types
 	$(DEFAULTER_GEN) \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--v=0 \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		--output-file=zz_generated.defaults.go \
@@ -263,36 +263,36 @@ generate-go-apis: ## Alias for .build/generate-go-apis
 	$(MAKE) defaulters
 
 	$(CONVERSION_GEN) \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./api/v1beta1 \
 		./cmd/clusterawsadm/api/bootstrap/v1alpha1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./$(EXP_DIR)/api/v1beta1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./bootstrap/eks/api/v1beta1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./controlplane/eks/api/v1beta1
 
 	$(CONVERSION_GEN) \
 		--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
-		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/core/v1beta2 \
 		--output-file=zz_generated.conversion.go \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
 		./controlplane/rosa/api/v1beta2

api/v1beta1/awscluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 const (
@@ -45,7 +45,7 @@ type AWSClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
-	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+	ControlPlaneEndpoint clusterv1beta1.APIEndpoint `json:"controlPlaneEndpoint"`
 
 	// AdditionalTags is an optional set of tags to add to AWS resources managed by the AWS provider, in addition to the
 	// ones added by default.
@@ -200,11 +200,11 @@ type AWSLoadBalancerSpec struct {
 // AWSClusterStatus defines the observed state of AWSCluster.
 type AWSClusterStatus struct {
 	// +kubebuilder:default=false
-	Ready          bool                     `json:"ready"`
-	Network        NetworkStatus            `json:"networkStatus,omitempty"`
-	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
-	Bastion        *Instance                `json:"bastion,omitempty"`
-	Conditions     clusterv1.Conditions     `json:"conditions,omitempty"`
+	Ready          bool                          `json:"ready"`
+	Network        NetworkStatus                 `json:"networkStatus,omitempty"`
+	FailureDomains clusterv1beta1.FailureDomains `json:"failureDomains,omitempty"`
+	Bastion        *Instance                     `json:"bastion,omitempty"`
+	Conditions     clusterv1beta1.Conditions     `json:"conditions,omitempty"`
 }
 
 // S3Bucket defines a supporting S3 bucket for the cluster, currently can be optionally used for Ignition.
@@ -254,12 +254,12 @@ type AWSClusterList struct {
 }
 
 // GetConditions returns the observations of the operational state of the AWSCluster resource.
-func (r *AWSCluster) GetConditions() clusterv1.Conditions {
+func (r *AWSCluster) GetConditions() clusterv1beta1.Conditions {
 	return r.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the AWSCluster to the predescribed clusterv1.Conditions.
-func (r *AWSCluster) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the underlying service state of the AWSCluster to the predescribed clusterv1beta1.Conditions.
+func (r *AWSCluster) SetConditions(conditions clusterv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta1/awsclustertemplate_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // AWSClusterTemplateSpec defines the desired state of AWSClusterTemplate.
@@ -58,6 +58,6 @@ type AWSClusterTemplateResource struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
-	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
-	Spec       AWSClusterSpec       `json:"spec"`
+	ObjectMeta clusterv1beta1.ObjectMeta `json:"metadata,omitempty"`
+	Spec       AWSClusterSpec            `json:"spec"`
 }

api/v1beta1/awsmachine_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 const (
@@ -207,7 +207,7 @@ type AWSMachineStatus struct {
 	Interruptible bool `json:"interruptible,omitempty"`
 
 	// Addresses contains the AWS instance associated addresses.
-	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
+	Addresses []clusterv1beta1.MachineAddress `json:"addresses,omitempty"`
 
 	// InstanceState is the state of the AWS instance for this machine.
 	// +optional
@@ -253,7 +253,7 @@ type AWSMachineStatus struct {
 
 	// Conditions defines current service state of the AWSMachine.
 	// +optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	Conditions clusterv1beta1.Conditions `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -276,12 +276,12 @@ type AWSMachine struct {
 }
 
 // GetConditions returns the observations of the operational state of the AWSMachine resource.
-func (r *AWSMachine) GetConditions() clusterv1.Conditions {
+func (r *AWSMachine) GetConditions() clusterv1beta1.Conditions {
 	return r.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the AWSMachine to the predescribed clusterv1.Conditions.
-func (r *AWSMachine) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the underlying service state of the AWSMachine to the predescribed clusterv1beta1.Conditions.
+func (r *AWSMachine) SetConditions(conditions clusterv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta1/awsmachinetemplate_types.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // AWSMachineTemplateStatus defines a status for an AWSMachineTemplate.
@@ -65,7 +65,7 @@ type AWSMachineTemplateResource struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
-	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
+	ObjectMeta clusterv1beta1.ObjectMeta `json:"metadata,omitempty"`
 
 	// Spec is the specification of the desired behavior of the machine.
 	Spec AWSMachineSpec `json:"spec"`