feat: upgrade cluster-api to v1.9.11 with v1beta2 conditions

.golangci.yml

@@ -88,6 +88,8 @@ linters-settings:
         alias: clusterv1
       - pkg: "sigs.k8s.io/cluster-api/test/e2e"
         alias: capie2e
+      - pkg: "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
+        alias: conditions
       # Own module
       - pkg: github.com/ionos-cloud/cluster-api-provider-ionoscloud/api/v1alpha1
         alias: infrav1
@@ -146,7 +148,7 @@ issues:
     - linters:
         - revive
       text: "comment-spacings: no space between comment delimiter and comment text"
-      source: "//(\\+(kubebuilder|optional|required)|#nosec)"
+      source: "//(\\+(kubebuilder|optional|required|listType|listMapKey)|#nosec)"
     - linters:
         - revive
       text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"

README.md

@@ -47,13 +47,14 @@ This provider requires **Go 1.25 or newer**. The exact version is specified in `
 
 This provider's versions are compatible with the following versions of Cluster API:
 
-|                       | Cluster API v1beta1 (v1.7) | Cluster API v1beta1 (v1.8) |
-|-----------------------|:--------------------------:|:--------------------------:|
-| CAPIC v1alpha1 (v0.2) |             ✓              |             ☓              |
-| CAPIC v1alpha1 (v0.3) |             ✓              |             ☓              |
-| CAPIC v1alpha1 (v0.4) |             ✓              |             ✓              |
-| CAPIC v1alpha1 (v0.5) |             ✓              |             ✓              |
-| CAPIC v1alpha1 (v0.6) |             ✓              |             ✓              |
+|                       | Cluster API v1beta1 (v1.7) | Cluster API v1beta1 (v1.8) | Cluster API v1beta1 (v1.9) |
+|-----------------------|:--------------------------:|:--------------------------:|:--------------------------:|
+| CAPIC v1alpha1 (v0.2) |             ✓              |             ☓              |             ☓              |
+| CAPIC v1alpha1 (v0.3) |             ✓              |             ☓              |             ☓              |
+| CAPIC v1alpha1 (v0.4) |             ✓              |             ✓              |             ☓              |
+| CAPIC v1alpha1 (v0.5) |             ✓              |             ✓              |             ☓              |
+| CAPIC v1alpha1 (v0.6) |             ✓              |             ✓              |             ☓              |
+| CAPIC v1alpha1 (v0.7) |             ☓              |             ☓              |             ✓              |
 
 ### Kubernetes Versions 
 

api/v1alpha1/ionoscloudcluster_types.go

@@ -28,7 +28,7 @@ const (
 	ClusterFinalizer = "ionoscloudcluster.infrastructure.cluster.x-k8s.io"
 
 	// IonosCloudClusterReady is the condition for the IonosCloudCluster, which indicates that the cluster is ready.
-	IonosCloudClusterReady clusterv1.ConditionType = "ClusterReady"
+	IonosCloudClusterReady = "ClusterReady"
 
 	// IonosCloudClusterKind is the string resource kind of the IonosCloudCluster resource.
 	IonosCloudClusterKind = "IonosCloudCluster"
@@ -70,7 +70,9 @@ type IonosCloudClusterStatus struct {
 
 	// Conditions defines current service state of the IonosCloudCluster.
 	//+optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+	//+listType=map
+	//+listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// CurrentRequestByDatacenter maps data center IDs to a pending provisioning request made during reconciliation.
 	//+optional
@@ -114,13 +116,13 @@ func init() {
 	objectTypes = append(objectTypes, &IonosCloudCluster{}, &IonosCloudClusterList{})
 }
 
-// GetConditions returns the conditions from the status.
-func (i *IonosCloudCluster) GetConditions() clusterv1.Conditions {
+// GetV1Beta2Conditions returns the v1beta2 conditions from the status.
+func (i *IonosCloudCluster) GetV1Beta2Conditions() []metav1.Condition {
 	return i.Status.Conditions
 }
 
-// SetConditions sets the conditions in the status.
-func (i *IonosCloudCluster) SetConditions(conditions clusterv1.Conditions) {
+// SetV1Beta2Conditions sets the v1beta2 conditions in the status.
+func (i *IonosCloudCluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
 	i.Status.Conditions = conditions
 }
 

api/v1alpha1/ionoscloudcluster_types_test.go

@@ -24,7 +24,7 @@ import (
 	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"
+	conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -38,11 +38,16 @@ const (
 )
 
 func TestIonosCloudCluster_Conditions(t *testing.T) {
-	conds := clusterv1.Conditions{{Type: "type"}}
+	conds := []metav1.Condition{{
+		Type:               "type",
+		Status:             metav1.ConditionTrue,
+		Reason:             "reason",
+		LastTransitionTime: metav1.Now(),
+	}}
 	cluster := &IonosCloudCluster{}
 
-	cluster.SetConditions(conds)
-	require.Equal(t, conds, cluster.GetConditions())
+	cluster.SetV1Beta2Conditions(conds)
+	require.Equal(t, conds, cluster.GetV1Beta2Conditions())
 }
 
 func defaultCluster() *IonosCloudCluster {
@@ -163,7 +168,11 @@ var _ = Describe("IonosCloudCluster", func() {
 			fetched.Status.CurrentRequestByDatacenter = map[string]ProvisioningRequest{
 				"123": wantProvisionRequest,
 			}
-			conditions.MarkTrue(fetched, clusterv1.ReadyCondition)
+			conditions.Set(fetched, metav1.Condition{
+				Type:   clusterv1.ReadyV1Beta2Condition,
+				Status: metav1.ConditionTrue,
+				Reason: clusterv1.ReadyV1Beta2Condition,
+			})
 
 			By("updating the cluster status")
 			Expect(k8sClient.Status().Update(context.Background(), fetched)).To(Succeed())
@@ -173,7 +182,7 @@ var _ = Describe("IonosCloudCluster", func() {
 			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.Status.Conditions[0].Status).To(Equal(metav1.ConditionTrue))
 
 			By("Removing the entry from the status again")
 			delete(fetched.Status.CurrentRequestByDatacenter, "123")

api/v1alpha1/ionoscloudmachine_types.go

@@ -20,8 +20,6 @@ import (
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/errors"
 
 	"github.com/ionos-cloud/cluster-api-provider-ionoscloud/internal/util/ptr"
 )
@@ -38,7 +36,7 @@ const (
 
 	// MachineProvisionedCondition documents the status of the provisioning of a IonosCloudMachine and
 	// the underlying VM.
-	MachineProvisionedCondition clusterv1.ConditionType = "MachineProvisioned"
+	MachineProvisionedCondition = "MachineProvisioned"
 
 	// WaitingForClusterInfrastructureReason (Severity=Info) indicates that the IonosCloudMachine is currently
 	// waiting for the cluster infrastructure to become ready.
@@ -296,47 +294,11 @@ type IonosCloudMachineStatus struct {
 	//+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.
-	//+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
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
 	// CurrentRequest shows the current provisioning request for any
 	// cloud resource that is being provisioned.
@@ -406,13 +368,13 @@ 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 {
+// GetV1Beta2Conditions returns the v1beta2 conditions from the status.
+func (m *IonosCloudMachine) GetV1Beta2Conditions() []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) {
+// SetV1Beta2Conditions sets the v1beta2 conditions in the status.
+func (m *IonosCloudMachine) SetV1Beta2Conditions(conditions []metav1.Condition) {
 	m.Status.Conditions = conditions
 }
 

api/v1alpha1/ionoscloudmachine_types_test.go

@@ -23,8 +23,7 @@ import (
 	sdk "github.com/ionos-cloud/sdk-go/v6"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/cluster-api/errors"
-	"sigs.k8s.io/cluster-api/util/conditions"
+	conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/ionos-cloud/cluster-api-provider-ionoscloud/internal/util/ptr"
@@ -535,17 +534,20 @@ var _ = Describe("IonosCloudMachine Tests", func() {
 			Expect(k8sClient.Get(
 				context.Background(), client.ObjectKey{Name: m.Name, Namespace: m.Namespace}, m)).To(Succeed())
 
-			// Calls SetConditions with required fields
-			conditions.MarkTrue(m, MachineProvisionedCondition)
+			conditions.Set(m, metav1.Condition{
+				Type:   MachineProvisionedCondition,
+				Status: metav1.ConditionTrue,
+				Reason: MachineProvisionedCondition,
+			})
 
 			Expect(k8sClient.Status().Update(context.Background(), m)).To(Succeed())
 			Expect(k8sClient.Get(context.Background(),
 				client.ObjectKey{Name: m.Name, Namespace: m.Namespace}, m)).To(Succeed())
 
-			machineConditions := m.GetConditions()
+			machineConditions := m.GetV1Beta2Conditions()
 			Expect(machineConditions).To(HaveLen(1))
 			Expect(machineConditions[0].Type).To(Equal(MachineProvisionedCondition))
-			Expect(machineConditions[0].Status).To(Equal(corev1.ConditionTrue))
+			Expect(machineConditions[0].Status).To(Equal(metav1.ConditionTrue))
 		})
 	})
 	Context("Status", func() {
@@ -556,14 +558,16 @@ var _ = Describe("IonosCloudMachine Tests", func() {
 				client.ObjectKey{Name: m.Name, Namespace: m.Namespace}, m)).To(Succeed())
 
 			m.Status.Ready = true
-			conditions.MarkTrue(m, MachineProvisionedCondition)
+			conditions.Set(m, metav1.Condition{
+				Type:   MachineProvisionedCondition,
+				Status: metav1.ConditionTrue,
+				Reason: MachineProvisionedCondition,
+			})
 			m.Status.CurrentRequest = &ProvisioningRequest{
 				Method:      "GET",
 				RequestPath: "path/to/resource",
 				State:       sdk.RequestStatusRunning,
 			}
-			m.Status.FailureReason = ptr.To(errors.InvalidConfigurationMachineError)
-			m.Status.FailureMessage = ptr.To("Failure message")
 			m.Status.Location = "de/fra"
 
 			m.Status.MachineNetworkInfo = &MachineNetworkInfo{

config/crd/bases/infrastructure.cluster.x-k8s.io_ionoscloudclusters.yaml

@@ -133,48 +133,63 @@ spec:
               conditions:
                 description: Conditions defines current service state of the IonosCloudCluster.
                 items:
-                  description: Condition defines an observation of a Cluster API resource
-                    operational state.
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
-                        Last time the condition transitioned from one status to another.
-                        This should be when the underlying condition changed. If that is not known, then using the time when
-                        the API field changed is acceptable.
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
                       description: |-
-                        A human readable message indicating details about the transition.
-                        This field may be empty.
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
                       type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
                     reason:
                       description: |-
-                        The reason for the condition's last transition in CamelCase.
-                        The specific API may choose whether or not this field is considered a guaranteed API.
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
                         This field may not be empty.
-                      type: string
-                    severity:
-                      description: |-
-                        Severity provides an explicit classification of Reason code, so the users or machines can immediately
-                        understand the current situation and act accordingly.
-                        The Severity field MUST be set only when Status=False.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
                       type: string
                     status:
-                      description: Status of the condition, one of True, False, Unknown.
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
                       type: string
                     type:
-                      description: |-
-                        Type of condition in CamelCase or in foo.example.com/CamelCase.
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
-                        can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
                   required:
                   - lastTransitionTime
+                  - message
+                  - reason
                   - status
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
               controlPlaneEndpointIPBlockID:
                 description: ControlPlaneEndpointIPBlockID is the IONOS Cloud UUID
                   for the control plane endpoint IP block.