Upgrade CAPI to 1.6

Makefile

@@ -91,7 +91,7 @@ managers:
 manager-cloudstack-infrastructure: ## Build manager binary.
 	CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -ldflags "${LDFLAGS} -extldflags '-static'" -o $(BIN_DIR)/manager .
 
-export K8S_VERSION=1.26.1
+export K8S_VERSION=1.28.3
 $(KUBECTL) $(API_SERVER) $(ETCD) &:
 	cd $(TOOLS_DIR) && curl --silent -L "https://go.kubebuilder.io/test-tools/${K8S_VERSION}/$(shell go env GOOS)/$(shell go env GOARCH)" --output - | \
 		tar -C ./ --strip-components=1 -zvxf -
@@ -244,7 +244,7 @@ delete-kind-cluster:
 	kind delete cluster --name $(KIND_CLUSTER_NAME)
 
 cluster-api: ## Clone cluster-api repository for tilt use.
-	git clone --branch v1.4.8 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
+	git clone --branch v1.6.8 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
 
 cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
 	cp ./hack/tilt-settings.json cluster-api

api/v1beta1/cloudstackaffinitygroup_types.go

@@ -66,5 +66,5 @@ type CloudStackAffinityGroupList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
+	objectTypes = append(objectTypes, &CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
 }

api/v1beta1/cloudstackcluster_types.go

@@ -154,5 +154,5 @@ type CloudStackClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackCluster{}, &CloudStackClusterList{})
+	objectTypes = append(objectTypes, &CloudStackCluster{}, &CloudStackClusterList{})
 }

api/v1beta1/cloudstackisolatednetwork_types.go

@@ -81,5 +81,5 @@ type CloudStackIsolatedNetworkList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackIsolatedNetwork{}, &CloudStackIsolatedNetworkList{})
+	objectTypes = append(objectTypes, &CloudStackIsolatedNetwork{}, &CloudStackIsolatedNetworkList{})
 }

api/v1beta1/cloudstackmachine_types.go

@@ -180,5 +180,5 @@ type CloudStackMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachine{}, &CloudStackMachineList{})
+	objectTypes = append(objectTypes, &CloudStackMachine{}, &CloudStackMachineList{})
 }

api/v1beta1/cloudstackmachinestatechecker_types.go

@@ -54,5 +54,5 @@ type CloudStackMachineStateCheckerList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachineStateChecker{}, &CloudStackMachineStateCheckerList{})
+	objectTypes = append(objectTypes, &CloudStackMachineStateChecker{}, &CloudStackMachineStateCheckerList{})
 }

api/v1beta1/cloudstackmachinetemplate_types.go

@@ -54,5 +54,5 @@ type CloudStackMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachineTemplate{}, &CloudStackMachineTemplateList{})
+	objectTypes = append(objectTypes, &CloudStackMachineTemplate{}, &CloudStackMachineTemplateList{})
 }

api/v1beta1/cloudstackzone_types.go

@@ -66,5 +66,5 @@ type CloudStackZoneList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackZone{}, &CloudStackZoneList{})
+	objectTypes = append(objectTypes, &CloudStackZone{}, &CloudStackZoneList{})
 }

api/v1beta1/groupversion_info.go

@@ -20,20 +20,29 @@ limitations under the License.
 package v1beta1
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
 
 	// So the auto-generated code can compile
-	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
+	objectTypes = []runtime.Object{}
+
+	localSchemeBuilder = &schemeBuilder
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}

api/v1beta2/cloudstackaffinitygroup_types.go

@@ -68,5 +68,5 @@ type CloudStackAffinityGroupList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
+	objectTypes = append(objectTypes, &CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
 }

api/v1beta2/cloudstackcluster_types.go

@@ -71,5 +71,5 @@ type CloudStackClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackCluster{}, &CloudStackClusterList{})
+	objectTypes = append(objectTypes, &CloudStackCluster{}, &CloudStackClusterList{})
 }

api/v1beta2/cloudstackfailuredomain_types.go

@@ -117,5 +117,5 @@ type CloudStackFailureDomainList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackFailureDomain{}, &CloudStackFailureDomainList{})
+	objectTypes = append(objectTypes, &CloudStackFailureDomain{}, &CloudStackFailureDomainList{})
 }

api/v1beta2/cloudstackisolatednetwork_types.go

@@ -82,5 +82,5 @@ type CloudStackIsolatedNetworkList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackIsolatedNetwork{}, &CloudStackIsolatedNetworkList{})
+	objectTypes = append(objectTypes, &CloudStackIsolatedNetwork{}, &CloudStackIsolatedNetworkList{})
 }

api/v1beta2/cloudstackmachine_types.go

@@ -182,5 +182,5 @@ type CloudStackMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachine{}, &CloudStackMachineList{})
+	objectTypes = append(objectTypes, &CloudStackMachine{}, &CloudStackMachineList{})
 }

api/v1beta2/cloudstackmachinestatechecker_types.go

@@ -52,5 +52,5 @@ type CloudStackMachineStateCheckerList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachineStateChecker{}, &CloudStackMachineStateCheckerList{})
+	objectTypes = append(objectTypes, &CloudStackMachineStateChecker{}, &CloudStackMachineStateCheckerList{})
 }

api/v1beta2/cloudstackmachinetemplate_types.go

@@ -53,5 +53,5 @@ type CloudStackMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachineTemplate{}, &CloudStackMachineTemplateList{})
+	objectTypes = append(objectTypes, &CloudStackMachineTemplate{}, &CloudStackMachineTemplateList{})
 }

api/v1beta2/groupversion_info.go

@@ -20,20 +20,28 @@ limitations under the License.
 package v1beta2
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta2"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
+	AddToScheme = schemeBuilder.AddToScheme
 
-	// localSchemeBuilder is used for type conversions.
-	localSchemeBuilder = &SchemeBuilder.SchemeBuilder
+	objectTypes = []runtime.Object{}
+
+	localSchemeBuilder = &schemeBuilder
 )
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion, objectTypes...)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}

api/v1beta3/cloudstackaffinitygroup_types.go

@@ -69,5 +69,5 @@ type CloudStackAffinityGroupList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
+	objectTypes = append(objectTypes, &CloudStackAffinityGroup{}, &CloudStackAffinityGroupList{})
 }

api/v1beta3/cloudstackcluster_types.go

@@ -80,5 +80,5 @@ type CloudStackClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackCluster{}, &CloudStackClusterList{})
+	objectTypes = append(objectTypes, &CloudStackCluster{}, &CloudStackClusterList{})
 }

api/v1beta3/cloudstackcluster_webhook.go

@@ -27,6 +27,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -53,7 +54,7 @@ func (r *CloudStackCluster) Default() {
 var _ webhook.Validator = &CloudStackCluster{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *CloudStackCluster) ValidateCreate() error {
+func (r *CloudStackCluster) ValidateCreate() (admission.Warnings, error) {
 	cloudstackclusterlog.V(1).Info("entered validate create webhook", "api resource name", r.Name)
 
 	var errorList field.ErrorList
@@ -80,18 +81,18 @@ func (r *CloudStackCluster) ValidateCreate() error {
 		}
 	}
 
-	return webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
+	return nil, webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *CloudStackCluster) ValidateUpdate(old runtime.Object) error {
+func (r *CloudStackCluster) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	cloudstackclusterlog.V(1).Info("entered validate update webhook", "api resource name", r.Name)
 
 	spec := r.Spec
 
 	oldCluster, ok := old.(*CloudStackCluster)
 	if !ok {
-		return errors.NewBadRequest(fmt.Sprintf("expected a CloudStackCluster but got a %T", old))
+		return nil, errors.NewBadRequest(fmt.Sprintf("expected a CloudStackCluster but got a %T", old))
 	}
 	oldSpec := oldCluster.Spec
 
@@ -109,7 +110,7 @@ func (r *CloudStackCluster) ValidateUpdate(old runtime.Object) error {
 			"controlplaneendpoint.port", errorList)
 	}
 
-	return webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
+	return nil, webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
 }
 
 // ValidateFailureDomainUpdates verifies that at least one failure domain has not been deleted, and
@@ -150,8 +151,8 @@ func FailureDomainsEqual(fd1, fd2 CloudStackFailureDomainSpec) bool {
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *CloudStackCluster) ValidateDelete() error {
+func (r *CloudStackCluster) ValidateDelete() (admission.Warnings, error) {
 	cloudstackclusterlog.V(1).Info("entered validate delete webhook", "api resource name", r.Name)
 	// No deletion validations.  Deletion webhook not enabled.
-	return nil
+	return nil, nil
 }

api/v1beta3/cloudstackfailuredomain_types.go

@@ -148,5 +148,5 @@ type CloudStackFailureDomainList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackFailureDomain{}, &CloudStackFailureDomainList{})
+	objectTypes = append(objectTypes, &CloudStackFailureDomain{}, &CloudStackFailureDomainList{})
 }

api/v1beta3/cloudstackisolatednetwork_types.go

@@ -99,5 +99,5 @@ type CloudStackIsolatedNetworkList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackIsolatedNetwork{}, &CloudStackIsolatedNetworkList{})
+	objectTypes = append(objectTypes, &CloudStackIsolatedNetwork{}, &CloudStackIsolatedNetworkList{})
 }

api/v1beta3/cloudstackmachine_types.go

@@ -183,5 +183,5 @@ type CloudStackMachineList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachine{}, &CloudStackMachineList{})
+	objectTypes = append(objectTypes, &CloudStackMachine{}, &CloudStackMachineList{})
 }

api/v1beta3/cloudstackmachine_webhook.go

@@ -27,6 +27,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -53,7 +54,7 @@ func (r *CloudStackMachine) Default() {
 var _ webhook.Validator = &CloudStackMachine{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *CloudStackMachine) ValidateCreate() error {
+func (r *CloudStackMachine) ValidateCreate() (admission.Warnings, error) {
 	cloudstackmachinelog.V(1).Info("entered validate create webhook", "api resource name", r.Name)
 
 	var errorList field.ErrorList
@@ -64,18 +65,18 @@ func (r *CloudStackMachine) ValidateCreate() error {
 		errorList = webhookutil.EnsureIntFieldsAreNotNegative(r.Spec.DiskOffering.CustomSize, "customSizeInGB", errorList)
 	}
 
-	return webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
+	return nil, webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *CloudStackMachine) ValidateUpdate(old runtime.Object) error {
+func (r *CloudStackMachine) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 	cloudstackmachinelog.V(1).Info("entered validate update webhook", "api resource name", r.Name)
 
 	var errorList field.ErrorList
 
 	oldMachine, ok := old.(*CloudStackMachine)
 	if !ok {
-		return errors.NewBadRequest(fmt.Sprintf("expected a CloudStackMachine but got a %T", old))
+		return nil, errors.NewBadRequest(fmt.Sprintf("expected a CloudStackMachine but got a %T", old))
 	}
 	oldSpec := oldMachine.Spec
 
@@ -98,12 +99,12 @@ func (r *CloudStackMachine) ValidateUpdate(old runtime.Object) error {
 		errorList = append(errorList, field.Forbidden(field.NewPath("spec", "AffinityGroupIDs"), "AffinityGroupIDs"))
 	}
 
-	return webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
+	return nil, webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *CloudStackMachine) ValidateDelete() error {
+func (r *CloudStackMachine) ValidateDelete() (admission.Warnings, error) {
 	cloudstackmachinelog.V(1).Info("entered validate delete webhook", "api resource name", r.Name)
 	// No deletion validations.  Deletion webhook not enabled.
-	return nil
+	return nil, nil
 }

api/v1beta3/cloudstackmachinestatechecker_types.go

@@ -53,5 +53,5 @@ type CloudStackMachineStateCheckerList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachineStateChecker{}, &CloudStackMachineStateCheckerList{})
+	objectTypes = append(objectTypes, &CloudStackMachineStateChecker{}, &CloudStackMachineStateCheckerList{})
 }

api/v1beta3/cloudstackmachinetemplate_types.go

@@ -59,5 +59,5 @@ type CloudStackMachineTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackMachineTemplate{}, &CloudStackMachineTemplateList{})
+	objectTypes = append(objectTypes, &CloudStackMachineTemplate{}, &CloudStackMachineTemplateList{})
 }