Adopt CAPI v1beta2 api's

Author: Karthik-K-N

.golangci.yml

@@ -88,8 +88,10 @@ linters-settings:
         alias: capiv1alpha3
       - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
         alias: capiv1alpha4
-      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/core/v1beta1
         alias: capiv1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/core/v1beta2
+        alias: clusterv1
       # CAPI-IBMCLOUD
       - pkg: sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1
         alias: infrav1beta1
@@ -121,7 +123,7 @@ linters-settings:
     - whyNoLint
     - wrapperFunc
   unused:
-    go: "1.23"
+    go: "1.24"
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0
@@ -207,7 +209,7 @@ issues:
   - "zz_generated.*\\.go$"
 
 run:
-  go: "1.23"
+  go: "1.24"
   timeout: 20m
   build-tags:
   - tools

Makefile

@@ -84,7 +84,7 @@ RELEASE_NOTES_DIR := CHANGELOG
 OUTPUT_TYPE ?= type=registry
 
 # Go
-GO_VERSION ?=1.23.9
+GO_VERSION ?=1.24.0
 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
 
 # Trivy

api/v1beta1/conditions_consts.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -42,7 +42,7 @@ const (
 
 const (
 	// InstanceReadyCondition reports on current status of the instance. Ready indicates the instance is in a Running state.
-	InstanceReadyCondition capiv1beta1.ConditionType = "InstanceReady"
+	InstanceReadyCondition clusterv1.ConditionType = "InstanceReady"
 )
 
 const (
@@ -60,10 +60,10 @@ const (
 
 const (
 	// ImageReadyCondition reports on current status of the image. Ready indicates the image is in a active state.
-	ImageReadyCondition capiv1beta1.ConditionType = "ImageReady"
+	ImageReadyCondition clusterv1.ConditionType = "ImageReady"
 
 	// ImageImportedCondition reports on current status of the image import job. Ready indicates the import job is finished.
-	ImageImportedCondition capiv1beta1.ConditionType = "ImageImported"
+	ImageImportedCondition clusterv1.ConditionType = "ImageImported"
 )
 
 const (
@@ -73,5 +73,5 @@ const (
 
 const (
 	// LoadBalancerReadyCondition reports on current status of the load balancer. Ready indicates the load balancer is in a active state.
-	LoadBalancerReadyCondition capiv1beta1.ConditionType = "LoadBalancerReady"
+	LoadBalancerReadyCondition clusterv1.ConditionType = "LoadBalancerReady"
 )

api/v1beta1/ibmpowervscluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -44,7 +44,7 @@ type IBMPowerVSClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
-	ControlPlaneEndpoint capiv1beta1.APIEndpoint `json:"controlPlaneEndpoint"`
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 }
 
 // IBMPowerVSClusterStatus defines the observed state of IBMPowerVSCluster.

api/v1beta1/ibmpowervsclustertemplate_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // IBMPowerVSClusterTemplateSpec defines the desired state of IBMPowerVSClusterTemplate.
@@ -53,8 +53,8 @@ type IBMPowerVSClusterTemplateResource struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
 	// +optional
-	ObjectMeta capiv1beta1.ObjectMeta `json:"metadata,omitempty"`
-	Spec       IBMPowerVSClusterSpec  `json:"spec"`
+	ObjectMeta clusterv1.ObjectMeta  `json:"metadata,omitempty"`
+	Spec       IBMPowerVSClusterSpec `json:"spec"`
 }
 
 func init() {

api/v1beta1/ibmpowervsimage_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -82,7 +82,7 @@ type IBMPowerVSImageStatus struct {
 
 	// Conditions defines current service state of the IBMPowerVSImage.
 	// +optional
-	Conditions capiv1beta1.Conditions `json:"conditions,omitempty"`
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
 //+kubebuilder:object:root=true
@@ -100,12 +100,12 @@ type IBMPowerVSImage struct {
 }
 
 // GetConditions returns the observations of the operational state of the IBMPowerVSImage resource.
-func (r *IBMPowerVSImage) GetConditions() capiv1beta1.Conditions {
+func (r *IBMPowerVSImage) GetConditions() clusterv1.Conditions {
 	return r.Status.Conditions
 }
 
 // SetConditions sets the underlying service state of the IBMPowerVSImage to the predescribed clusterv1.Conditions.
-func (r *IBMPowerVSImage) SetConditions(conditions capiv1beta1.Conditions) {
+func (r *IBMPowerVSImage) SetConditions(conditions clusterv1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta1/ibmpowervsmachine_types.go

@@ -20,7 +20,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -164,7 +164,7 @@ type IBMPowerVSMachineStatus struct {
 
 	// Conditions defines current service state of the IBMPowerVSMachine.
 	// +optional
-	Conditions capiv1beta1.Conditions `json:"conditions,omitempty"`
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 
 	// Region specifies the Power VS Service instance region.
 	Region *string `json:"region,omitempty"`
@@ -194,12 +194,12 @@ type IBMPowerVSMachine struct {
 }
 
 // GetConditions returns the observations of the operational state of the IBMPowerVSMachine resource.
-func (r *IBMPowerVSMachine) GetConditions() capiv1beta1.Conditions {
+func (r *IBMPowerVSMachine) GetConditions() clusterv1.Conditions {
 	return r.Status.Conditions
 }
 
 // SetConditions sets the underlying service state of the IBMPowerVSMachine to the predescribed clusterv1.Conditions.
-func (r *IBMPowerVSMachine) SetConditions(conditions capiv1beta1.Conditions) {
+func (r *IBMPowerVSMachine) SetConditions(conditions clusterv1.Conditions) {
 	r.Status.Conditions = conditions
 }
 

api/v1beta1/ibmvpccluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
@@ -49,7 +49,7 @@ type IBMVPCClusterSpec struct {
 
 	// ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
 	// +optional
-	ControlPlaneEndpoint capiv1beta1.APIEndpoint `json:"controlPlaneEndpoint"`
+	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
 
 	// ControlPlaneLoadBalancer is optional configuration for customizing control plane behavior.
 	// +optional
@@ -83,7 +83,7 @@ type IBMVPCClusterStatus struct {
 
 	// Conditions defines current service state of the load balancer.
 	// +optional
-	Conditions capiv1beta1.Conditions `json:"conditions,omitempty"`
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
 // VPC holds the VPC information.
@@ -121,11 +121,11 @@ func init() {
 }
 
 // GetConditions returns the observations of the operational state of the IBMVPCCluster resource.
-func (r *IBMVPCCluster) GetConditions() capiv1beta1.Conditions {
+func (r *IBMVPCCluster) GetConditions() clusterv1.Conditions {
 	return r.Status.Conditions
 }
 
 // SetConditions sets the underlying service state of the IBMVPCCluster to the predescribed clusterv1.Conditions.
-func (r *IBMVPCCluster) SetConditions(conditions capiv1beta1.Conditions) {
+func (r *IBMVPCCluster) SetConditions(conditions clusterv1.Conditions) {
 	r.Status.Conditions = conditions
 }