Update cluster-api to v1.9.x

Author: Amulyam24

Makefile

@@ -81,7 +81,7 @@ PULL_POLICY ?= Always
 # Set build time variables including version details
 LDFLAGS := $(shell ./hack/version.sh)
 
-KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.3
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.31.0
 
 # main controller
 CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller

api/v1beta1/ibmpowervsmachine_types.go

@@ -21,7 +21,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/errors"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -142,7 +141,7 @@ type IBMPowerVSMachineStatus struct {
 	// can be added as events to the Machine object and/or logged in the
 	// controller's output.
 	// +optional
-	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
+	FailureReason *string `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

api/v1beta1/zz_generated.conversion.go

@@ -22,7 +22,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/errors"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -199,7 +198,7 @@ type IBMPowerVSMachineStatus struct {
 	// can be added as events to the Machine object and/or logged in the
 	// controller's output.
 	// +optional
-	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
+	FailureReason *string `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

api/v1beta1/zz_generated.deepcopy.go

@@ -21,7 +21,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	"sigs.k8s.io/cluster-api/errors"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -161,7 +160,7 @@ type IBMVPCMachineStatus struct {
 	// reconciling the Machine and will contain a succinct value suitable
 	// for machine interpretation.
 	// +optional
-	FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
+	FailureReason *string `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

api/v1beta2/ibmpowervsmachine_types.go

@@ -24,6 +24,9 @@ const (
 
 	// DefaultAPIServerPort is defuault API server port number.
 	DefaultAPIServerPort int32 = 6443
+
+	// UpdateMachineError indicates an error while trying to update a machine.
+	UpdateMachineError string = "UpdateError"
 )
 
 // PowerVSInstanceState describes the state of an IBM Power VS instance.

api/v1beta2/ibmvpcmachine_types.go

@@ -36,7 +36,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	capierrors "sigs.k8s.io/cluster-api/errors"
 	"sigs.k8s.io/cluster-api/util/patch"
 
 	infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
@@ -1055,7 +1054,7 @@ func (m *MachineScope) SetFailureMessage(message string) {
 }
 
 // SetFailureReason will set the Machine's Failure Reason.
-func (m *MachineScope) SetFailureReason(reason capierrors.MachineStatusError) {
+func (m *MachineScope) SetFailureReason(reason string) {
 	m.IBMVPCMachine.Status.FailureReason = ptr.To(reason)
 }
 

api/v1beta2/types.go

@@ -53,7 +53,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	capierrors "sigs.k8s.io/cluster-api/errors"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/patch"
 
@@ -728,7 +727,7 @@ func (m *PowerVSMachineScope) SetNotReady() {
 }
 
 // SetFailureReason will set status FailureReason for the machine.
-func (m *PowerVSMachineScope) SetFailureReason(reason capierrors.MachineStatusError) {
+func (m *PowerVSMachineScope) SetFailureReason(reason string) {
 	m.IBMPowerVSMachine.Status.FailureReason = &reason
 }