chore: upgrade cluster-api to v1.12.4

.golangci.yml

@@ -84,10 +84,16 @@ linters-settings:
       - pkg: sigs.k8s.io/controller-runtime
         alias: ctrl
       # Cluster API
-      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
         alias: clusterv1
       - pkg: "sigs.k8s.io/cluster-api/test/e2e"
         alias: capie2e
+      - pkg: "sigs.k8s.io/cluster-api/util/conditions"
+        alias: conditions
+      - pkg: "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
+        alias: deprecatedv1beta1conditions
+      - pkg: "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
+        alias: ipamv1
       # Own module
       - pkg: github.com/ionos-cloud/cluster-api-provider-ionoscloud/api/v1alpha1
         alias: infrav1
@@ -120,6 +126,8 @@ linters-settings:
         disabled: true
       - name: range-val-address
         disabled: true # Obsolete since Go 1.22
+      - name: redundant-import-alias
+        disabled: true # Conflicts with importas which enforces explicit aliases
       - name: struct-tag
         arguments:
           - json,inline
@@ -146,7 +154,7 @@ issues:
     - linters:
         - revive
       text: "comment-spacings: no space between comment delimiter and comment text"
-      source: "//(\\+(kubebuilder|optional|required)|#nosec)"
+      source: "//(\\+(kubebuilder|optional|required|list)|#nosec)"
     - linters:
         - revive
       text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"
@@ -205,4 +213,4 @@ run:
     - e2e
   timeout: 10m
   allow-parallel-runners: true
-  go: "1.22"
+  go: "1.25"

Makefile

@@ -176,7 +176,7 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 GOLANGCI ?= go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
-MOCKERY ?= go run github.com/vektra/mockery/v2@v2.53.5
+MOCKERY ?= GOTOOLCHAIN=go1.25.0 go run github.com/vektra/mockery/v2@v2.53.6
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.7.1

api/v1alpha1/ionoscloudcluster_types.go

@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -64,13 +64,19 @@ type IonosCloudClusterSpec struct {
 
 // IonosCloudClusterStatus defines the observed state of IonosCloudCluster.
 type IonosCloudClusterStatus struct {
-	// Ready indicates that the cluster is ready.
+	// Initialization provides observations of the IonosCloudCluster initialization process.
+	// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial
+	// cluster provisioning. The value of these fields is never updated after initial provisioning is completed.
+	// Use conditions to monitor the operational state of the cluster's infrastructure.
 	//+optional
-	Ready bool `json:"ready,omitempty"`
+	Initialization *IonosCloudClusterInitializationStatus `json:"initialization,omitempty"`
 
-	// Conditions defines current service state of the IonosCloudCluster.
+	// Conditions represents the observations of the current state of the IonosCloudCluster.
 	//+optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	//+listType=map
+	//+listMapKey=type
+	//+kubebuilder:validation:MaxItems=32
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// CurrentRequestByDatacenter maps data center IDs to a pending provisioning request made during reconciliation.
 	//+optional
@@ -83,13 +89,49 @@ type IonosCloudClusterStatus struct {
 	// ControlPlaneEndpointIPBlockID is the IONOS Cloud UUID for the control plane endpoint IP block.
 	//+optional
 	ControlPlaneEndpointIPBlockID string `json:"controlPlaneEndpointIPBlockID,omitempty"`
+
+	// Deprecated groups all status fields deprecated and scheduled for removal when v1beta1 contract support is dropped.
+	//+optional
+	Deprecated *IonosCloudClusterDeprecatedStatus `json:"deprecated,omitempty"`
+}
+
+// IonosCloudClusterInitializationStatus provides observations of the IonosCloudCluster initialization process.
+type IonosCloudClusterInitializationStatus struct {
+	// Provisioned is true when the infrastructure cluster is fully provisioned.
+	// NOTE: this field is part of the Cluster API contract and is used to orchestrate provisioning.
+	// The value of this field is never updated after initial provisioning is completed.
+	//+optional
+	Provisioned bool `json:"provisioned"`
+}
+
+// IonosCloudClusterDeprecatedStatus groups all status fields deprecated and scheduled for removal when
+// v1beta1 contract support is dropped.
+type IonosCloudClusterDeprecatedStatus struct {
+	// V1Beta1 groups all v1beta1 status fields that are deprecated and scheduled for removal.
+	//+optional
+	V1Beta1 *IonosCloudClusterV1Beta1DeprecatedStatus `json:"v1beta1,omitempty"`
+}
+
+// IonosCloudClusterV1Beta1DeprecatedStatus contains deprecated v1beta1 fields.
+type IonosCloudClusterV1Beta1DeprecatedStatus struct {
+	// Ready indicates that the cluster is ready.
+	//
+	// Deprecated: Use Initialization.Provisioned instead.
+	//+optional
+	Ready bool `json:"ready,omitempty"`
+
+	// Conditions defines current service state of the IonosCloudCluster using the deprecated v1beta1 condition type.
+	//
+	// Deprecated: Use the top-level conditions field instead.
+	//+optional
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:path=ionoscloudclusters,scope=Namespaced,categories=cluster-api;ionoscloud,shortName=icc
 //+kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster"
-//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Cluster infrastructure is ready"
+//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.initialization.provisioned",description="Cluster infrastructure is ready"
 //+kubebuilder:printcolumn:name="Endpoint",type="string",JSONPath=".spec.controlPlaneEndpoint",description="API Endpoint"
 
 // IonosCloudCluster is the Schema for the ionoscloudclusters API.
@@ -114,13 +156,32 @@ func init() {
 	objectTypes = append(objectTypes, &IonosCloudCluster{}, &IonosCloudClusterList{})
 }
 
-// GetConditions returns the conditions from the status.
-func (i *IonosCloudCluster) GetConditions() clusterv1.Conditions {
+// GetV1Beta1Conditions returns the deprecated v1beta1 conditions from status.deprecated.v1beta1.conditions.
+func (i *IonosCloudCluster) GetV1Beta1Conditions() clusterv1.Conditions {
+	if i.Status.Deprecated == nil || i.Status.Deprecated.V1Beta1 == nil {
+		return nil
+	}
+	return i.Status.Deprecated.V1Beta1.Conditions
+}
+
+// SetV1Beta1Conditions sets the deprecated v1beta1 conditions in status.deprecated.v1beta1.conditions.
+func (i *IonosCloudCluster) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
+	if i.Status.Deprecated == nil {
+		i.Status.Deprecated = &IonosCloudClusterDeprecatedStatus{}
+	}
+	if i.Status.Deprecated.V1Beta1 == nil {
+		i.Status.Deprecated.V1Beta1 = &IonosCloudClusterV1Beta1DeprecatedStatus{}
+	}
+	i.Status.Deprecated.V1Beta1.Conditions = conditions
+}
+
+// GetConditions returns the v1beta2 conditions from status.conditions.
+func (i *IonosCloudCluster) GetConditions() []metav1.Condition {
 	return i.Status.Conditions
 }
 
-// SetConditions sets the conditions in the status.
-func (i *IonosCloudCluster) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the v1beta2 conditions in status.conditions.
+func (i *IonosCloudCluster) SetConditions(conditions []metav1.Condition) {
 	i.Status.Conditions = conditions
 }
 

api/v1alpha1/ionoscloudcluster_types_test.go

@@ -23,8 +23,8 @@ import (
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/util/conditions"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
+	deprecatedv1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -41,8 +41,8 @@ func TestIonosCloudCluster_Conditions(t *testing.T) {
 	conds := clusterv1.Conditions{{Type: "type"}}
 	cluster := &IonosCloudCluster{}
 
-	cluster.SetConditions(conds)
-	require.Equal(t, conds, cluster.GetConditions())
+	cluster.SetV1Beta1Conditions(conds)
+	require.Equal(t, conds, cluster.GetV1Beta1Conditions())
 }
 
 func defaultCluster() *IonosCloudCluster {
@@ -149,12 +149,12 @@ var _ = Describe("IonosCloudCluster", func() {
 			key := client.ObjectKey{Namespace: cluster.Namespace, Name: cluster.Name}
 			fetched := &IonosCloudCluster{}
 			Expect(k8sClient.Get(context.Background(), key, fetched)).To(Succeed())
-			Expect(fetched.Status.Ready).To(BeFalse())
+			Expect(fetched.Status.Initialization).To(BeNil())
 			Expect(fetched.Status.CurrentRequestByDatacenter).To(BeEmpty())
-			Expect(fetched.Status.Conditions).To(BeEmpty())
+			Expect(fetched.GetV1Beta1Conditions()).To(BeEmpty())
 
 			By("retrieving the cluster and setting the status")
-			fetched.Status.Ready = true
+			fetched.Status.Initialization = &IonosCloudClusterInitializationStatus{Provisioned: true}
 			wantProvisionRequest := ProvisioningRequest{
 				Method:      "POST",
 				RequestPath: "/path/to/resource",
@@ -163,17 +163,18 @@ var _ = Describe("IonosCloudCluster", func() {
 			fetched.Status.CurrentRequestByDatacenter = map[string]ProvisioningRequest{
 				"123": wantProvisionRequest,
 			}
-			conditions.MarkTrue(fetched, clusterv1.ReadyCondition)
+			deprecatedv1beta1conditions.MarkTrue(fetched, clusterv1.ReadyCondition)
 
 			By("updating the cluster status")
 			Expect(k8sClient.Status().Update(context.Background(), fetched)).To(Succeed())
 
 			Expect(k8sClient.Get(context.Background(), key, fetched)).To(Succeed())
-			Expect(fetched.Status.Ready).To(BeTrue())
+			Expect(fetched.Status.Initialization).ToNot(BeNil())
+			Expect(fetched.Status.Initialization.Provisioned).To(BeTrue())
 			Expect(fetched.Status.CurrentRequestByDatacenter).To(HaveLen(1))
 			Expect(fetched.Status.CurrentRequestByDatacenter["123"]).To(Equal(wantProvisionRequest))
-			Expect(fetched.Status.Conditions).To(HaveLen(1))
-			Expect(conditions.IsTrue(fetched, clusterv1.ReadyCondition)).To(BeTrue())
+			Expect(fetched.GetV1Beta1Conditions()).To(HaveLen(1))
+			Expect(deprecatedv1beta1conditions.IsTrue(fetched, clusterv1.ReadyCondition)).To(BeTrue())
 
 			By("Removing the entry from the status again")
 			delete(fetched.Status.CurrentRequestByDatacenter, "123")

api/v1alpha1/ionoscloudmachine_types.go

@@ -20,8 +20,7 @@ import (
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/errors"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 
 	"github.com/ionos-cloud/cluster-api-provider-ionoscloud/internal/util/ptr"
 )
@@ -288,55 +287,23 @@ type ImageSelector struct {
 
 // IonosCloudMachineStatus defines the observed state of IonosCloudMachine.
 type IonosCloudMachineStatus struct {
-	// Ready indicates the VM has been provisioned and is ready.
+	// Initialization provides observations of the IonosCloudMachine initialization process.
+	// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial
+	// machine provisioning. The value of these fields is never updated after initial provisioning is completed.
+	// Use conditions to monitor the operational state of the machine's infrastructure.
 	//+optional
-	Ready bool `json:"ready"`
+	Initialization *IonosCloudMachineInitializationStatus `json:"initialization,omitempty"`
 
 	// MachineNetworkInfo contains information about the network configuration of the VM.
 	//+optional
 	MachineNetworkInfo *MachineNetworkInfo `json:"machineNetworkInfo,omitempty"`
 
-	// FailureReason will be set in the event that there is a terminal problem
-	// reconciling the Machine and will contain a succinct value suitable
-	// for machine interpretation.
-	//
-	// This field should not be set for transitive errors that a controller
-	// faces that are expected to be fixed automatically over
-	// time (like service outages), but instead indicate that something is
-	// fundamentally wrong with the Machine's spec or the configuration of
-	// the controller, and that manual intervention is required. Examples
-	// of terminal errors would be invalid combinations of settings in the
-	// spec, values that are unsupported by the controller, or the
-	// responsible controller itself being critically misconfigured.
-	//
-	// Any transient errors that occur during the reconciliation of IonosCloudMachines
-	// can be added as events to the IonosCloudMachine object and/or logged in the
-	// controller's output.
+	// Conditions represents the observations of the current state of the IonosCloudMachine.
 	//+optional
-	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
-
-	// FailureMessage will be set in the event that there is a terminal problem
-	// reconciling the Machine and will contain a more verbose string suitable
-	// for logging and human consumption.
-	//
-	// This field should not be set for transitive errors that a controller
-	// faces that are expected to be fixed automatically over
-	// time (like service outages), but instead indicate that something is
-	// fundamentally wrong with the Machine's spec or the configuration of
-	// the controller, and that manual intervention is required. Examples
-	// of terminal errors would be invalid combinations of settings in the
-	// spec, values that are unsupported by the controller, or the
-	// responsible controller itself being critically misconfigured.
-	//
-	// Any transient errors that occur during the reconciliation of IonosCloudMachines
-	// can be added as events to the IonosCloudMachine object and/or logged in the
-	// controller's output.
-	//+optional
-	FailureMessage *string `json:"failureMessage,omitempty"`
-
-	// Conditions defines current service state of the IonosCloudMachine.
-	//+optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	//+listType=map
+	//+listMapKey=type
+	//+kubebuilder:validation:MaxItems=32
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// CurrentRequest shows the current provisioning request for any
 	// cloud resource that is being provisioned.
@@ -346,6 +313,42 @@ type IonosCloudMachineStatus struct {
 	// Location is the location of the datacenter the VM is provisioned in.
 	//+optional
 	Location string `json:"location"`
+
+	// Deprecated groups all status fields deprecated and scheduled for removal when v1beta1 contract support is dropped.
+	//+optional
+	Deprecated *IonosCloudMachineDeprecatedStatus `json:"deprecated,omitempty"`
+}
+
+// IonosCloudMachineInitializationStatus provides observations of the IonosCloudMachine initialization process.
+type IonosCloudMachineInitializationStatus struct {
+	// Provisioned is true when the machine infrastructure is fully provisioned.
+	// NOTE: this field is part of the Cluster API contract and is used to orchestrate provisioning.
+	// The value of this field is never updated after initial provisioning is completed.
+	//+optional
+	Provisioned bool `json:"provisioned"`
+}
+
+// IonosCloudMachineDeprecatedStatus groups all status fields deprecated and scheduled for removal when
+// v1beta1 contract support is dropped.
+type IonosCloudMachineDeprecatedStatus struct {
+	// V1Beta1 groups all v1beta1 status fields that are deprecated and scheduled for removal.
+	//+optional
+	V1Beta1 *IonosCloudMachineV1Beta1DeprecatedStatus `json:"v1beta1,omitempty"`
+}
+
+// IonosCloudMachineV1Beta1DeprecatedStatus contains deprecated v1beta1 fields.
+type IonosCloudMachineV1Beta1DeprecatedStatus struct {
+	// Ready indicates the VM has been provisioned and is ready.
+	//
+	// Deprecated: Use Initialization.Provisioned instead.
+	//+optional
+	Ready bool `json:"ready,omitempty"`
+
+	// Conditions defines current service state of the IonosCloudMachine using the deprecated v1beta1 condition type.
+	//
+	// Deprecated: Use the top-level conditions field instead.
+	//+optional
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
 // MachineNetworkInfo contains information about the network configuration of the VM.
@@ -382,7 +385,7 @@ type NICInfo struct {
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:path=ionoscloudmachines,scope=Namespaced,categories=cluster-api;ionoscloud,shortName=icm
 //+kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster"
-//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Machine is ready"
+//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.initialization.provisioned",description="Machine is ready"
 //+kubebuilder:printcolumn:name="IPv4 Addresses",type="string",JSONPath=".status.machineNetworkInfo.nicInfo[*].ipv4Addresses"
 //+kubebuilder:printcolumn:name="Machine Connected Networks",type="string",JSONPath=".status.machineNetworkInfo.nicInfo[*].networkID"
 //+kubebuilder:printcolumn:name="IPv6 Addresses",type="string",JSONPath=".status.machineNetworkInfo.nicInfo[*].ipv6Addresses",priority=1
@@ -406,13 +409,32 @@ type IonosCloudMachineList struct {
 	Items           []IonosCloudMachine `json:"items"`
 }
 
-// GetConditions returns the observations of the operational state of the IonosCloudMachine resource.
-func (m *IonosCloudMachine) GetConditions() clusterv1.Conditions {
+// GetV1Beta1Conditions returns the deprecated v1beta1 conditions from status.deprecated.v1beta1.conditions.
+func (m *IonosCloudMachine) GetV1Beta1Conditions() clusterv1.Conditions {
+	if m.Status.Deprecated == nil || m.Status.Deprecated.V1Beta1 == nil {
+		return nil
+	}
+	return m.Status.Deprecated.V1Beta1.Conditions
+}
+
+// SetV1Beta1Conditions sets the deprecated v1beta1 conditions in status.deprecated.v1beta1.conditions.
+func (m *IonosCloudMachine) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
+	if m.Status.Deprecated == nil {
+		m.Status.Deprecated = &IonosCloudMachineDeprecatedStatus{}
+	}
+	if m.Status.Deprecated.V1Beta1 == nil {
+		m.Status.Deprecated.V1Beta1 = &IonosCloudMachineV1Beta1DeprecatedStatus{}
+	}
+	m.Status.Deprecated.V1Beta1.Conditions = conditions
+}
+
+// GetConditions returns the v1beta2 conditions from status.conditions.
+func (m *IonosCloudMachine) GetConditions() []metav1.Condition {
 	return m.Status.Conditions
 }
 
-// SetConditions sets the underlying service state of the IonosCloudMachine to the predescribed clusterv1.Conditions.
-func (m *IonosCloudMachine) SetConditions(conditions clusterv1.Conditions) {
+// SetConditions sets the v1beta2 conditions in status.conditions.
+func (m *IonosCloudMachine) SetConditions(conditions []metav1.Condition) {
 	m.Status.Conditions = conditions
 }