Upgrade CAPI to 1.8

Author: vishesh92

.golangci.yml

@@ -32,9 +32,7 @@ linters:
 
 run:
   issues-exit-code: 1
-  skip-dirs:
-    - pkg/mocks
-    - test
+  tests: false
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source
@@ -43,3 +41,6 @@ issues:
     - path: _test\.go
       linters:
         - gosec
+  exclude-dirs:
+    - pkg/mocks
+    - test

Makefile

@@ -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.7.9 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
+	git clone --branch  v1.8.11 --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

config/manager/manager.yaml

@@ -39,6 +39,7 @@ spec:
           privileged: false
           runAsUser: 65532
           runAsGroup: 65532
+        terminationMessagePolicy: FallbackToLogsOnError
         livenessProbe:
           httpGet:
             path: /healthz

controllers/cloudstackcluster_controller.go

@@ -22,12 +22,12 @@ import (
 	"reflect"
 
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/pkg/errors"
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -159,10 +159,9 @@ func (r *CloudStackClusterReconciliationRunner) ReconcileDelete() (ctrl.Result,
 func (reconciler *CloudStackClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opts controller.Options) error {
 	log := ctrl.LoggerFrom(ctx)
 
-	controller, err := ctrl.NewControllerManagedBy(mgr).
+	b := ctrl.NewControllerManagedBy(mgr).
 		WithOptions(opts).
-		For(&infrav1.CloudStackCluster{}).
-		WithEventFilter(
+		For(&infrav1.CloudStackCluster{}, builder.WithPredicates(
 			predicate.Funcs{
 				UpdateFunc: func(e event.UpdateEvent) bool {
 					oldCluster := e.ObjectOld.(*infrav1.CloudStackCluster).DeepCopy()
@@ -183,18 +182,20 @@ func (reconciler *CloudStackClusterReconciler) SetupWithManager(ctx context.Cont
 					return !reflect.DeepEqual(oldCluster, newCluster)
 				},
 			},
-		).Build(reconciler)
-	if err != nil {
-		return errors.Wrap(err, "building CloudStackCluster controller")
-	}
+		),
+		)
 
 	// Add a watch on CAPI Cluster objects for unpause and ready events.
-	if err = controller.Watch(
-		source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
+	b = b.Watches(
+		&clusterv1.Cluster{},
 		handler.EnqueueRequestsFromMapFunc(
 			util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("CloudStackCluster"), mgr.GetClient(), &infrav1.CloudStackCluster{})),
-		predicates.ClusterUnpaused(log),
-	); err != nil {
+		builder.WithPredicates(
+			predicates.ClusterUnpaused(log),
+		),
+	)
+
+	if err := b.Complete(reconciler); err != nil {
 		return errors.Wrap(err, "building CloudStackCluster controller")
 	}
 

controllers/cloudstackmachine_controller.go

@@ -32,13 +32,13 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/predicates"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
-	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/controllers/utils"
@@ -362,62 +362,59 @@ func (r *CloudStackMachineReconciliationRunner) ReconcileDelete() (retRes ctrl.R
 func (reconciler *CloudStackMachineReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, opts controller.Options) error {
 	log := ctrl.LoggerFrom(ctx)
 
-	controller, err := ctrl.NewControllerManagedBy(mgr).
+	b := ctrl.NewControllerManagedBy(mgr).
 		WithOptions(opts).
-		For(&infrav1.CloudStackMachine{}).
-		WithEventFilter(
-			predicate.Funcs{
-				UpdateFunc: func(e event.UpdateEvent) bool {
-					oldMachine := e.ObjectOld.(*infrav1.CloudStackMachine).DeepCopy()
-					newMachine := e.ObjectNew.(*infrav1.CloudStackMachine).DeepCopy()
-					// Ignore resource version because they are unique
-					oldMachine.ObjectMeta.ResourceVersion = ""
-					newMachine.ObjectMeta.ResourceVersion = ""
-					// Ignore generation because it's not used in reconcile
-					oldMachine.ObjectMeta.Generation = 0
-					newMachine.ObjectMeta.Generation = 0
-					// Ignore finalizers updates
-					oldMachine.ObjectMeta.Finalizers = nil
-					newMachine.ObjectMeta.Finalizers = nil
-					// Ignore ManagedFields because they are mirror of ObjectMeta
-					oldMachine.ManagedFields = nil
-					newMachine.ManagedFields = nil
-					// Ignore incremental status updates
-					oldMachine.Status = infrav1.CloudStackMachineStatus{}
-					newMachine.Status = infrav1.CloudStackMachineStatus{}
-					// Ignore provide ID
-					oldMachine.Spec.ProviderID = nil
-					newMachine.Spec.ProviderID = nil
-					// Ignore instance ID
-					oldMachine.Spec.InstanceID = nil
-					newMachine.Spec.InstanceID = nil
-
-					return !reflect.DeepEqual(oldMachine, newMachine)
+		For(&infrav1.CloudStackMachine{},
+			builder.WithPredicates(
+				predicate.Funcs{
+					UpdateFunc: func(e event.UpdateEvent) bool {
+						oldMachine := e.ObjectOld.(*infrav1.CloudStackMachine).DeepCopy()
+						newMachine := e.ObjectNew.(*infrav1.CloudStackMachine).DeepCopy()
+						// Ignore resource version because they are unique
+						oldMachine.ObjectMeta.ResourceVersion = ""
+						newMachine.ObjectMeta.ResourceVersion = ""
+						// Ignore generation because it's not used in reconcile
+						oldMachine.ObjectMeta.Generation = 0
+						newMachine.ObjectMeta.Generation = 0
+						// Ignore finalizers updates
+						oldMachine.ObjectMeta.Finalizers = nil
+						newMachine.ObjectMeta.Finalizers = nil
+						// Ignore ManagedFields because they are mirror of ObjectMeta
+						oldMachine.ManagedFields = nil
+						newMachine.ManagedFields = nil
+						// Ignore incremental status updates
+						oldMachine.Status = infrav1.CloudStackMachineStatus{}
+						newMachine.Status = infrav1.CloudStackMachineStatus{}
+						// Ignore provide ID
+						oldMachine.Spec.ProviderID = nil
+						newMachine.Spec.ProviderID = nil
+						// Ignore instance ID
+						oldMachine.Spec.InstanceID = nil
+						newMachine.Spec.InstanceID = nil
+
+						return !reflect.DeepEqual(oldMachine, newMachine)
+					},
 				},
-			},
-		).Build(reconciler)
-	if err != nil {
-		return err
-	}
+			),
+		)
 
 	// Watch CAPI machines for changes.
 	// Queues a reconcile request for owned CloudStackMachine on change.
 	// Used to update when bootstrap data becomes available.
-	if err = controller.Watch(
-		source.Kind(mgr.GetCache(), &clusterv1.Machine{}),
+	b = b.Watches(
+		&clusterv1.Machine{},
 		handler.EnqueueRequestsFromMapFunc(
 			util.MachineToInfrastructureMapFunc(infrav1.GroupVersion.WithKind("CloudStackMachine"))),
-		predicate.Funcs{
-			UpdateFunc: func(e event.UpdateEvent) bool {
-				oldMachine := e.ObjectOld.(*clusterv1.Machine)
-				newMachine := e.ObjectNew.(*clusterv1.Machine)
-
-				return oldMachine.Spec.Bootstrap.DataSecretName == nil && newMachine.Spec.Bootstrap.DataSecretName != nil
-			},
-		},
-	); err != nil {
-		return err
-	}
+		builder.WithPredicates(
+			predicate.Funcs{
+				UpdateFunc: func(e event.UpdateEvent) bool {
+					oldMachine := e.ObjectOld.(*clusterv1.Machine)
+					newMachine := e.ObjectNew.(*clusterv1.Machine)
+
+					return oldMachine.Spec.Bootstrap.DataSecretName == nil && newMachine.Spec.Bootstrap.DataSecretName != nil
+				},
+			}),
+	)
 
 	// Used below, this maps CAPI clusters to CAPC machines
 	csMachineMapper, err := util.ClusterToTypedObjectsMapper(reconciler.K8sClient, &infrav1.CloudStackMachineList{}, mgr.GetScheme())
@@ -427,9 +424,16 @@ func (reconciler *CloudStackMachineReconciler) SetupWithManager(ctx context.Cont
 
 	reconciler.Recorder = mgr.GetEventRecorderFor("capc-machine-controller")
 	// Add a watch on CAPI Cluster objects for unpause and ready events.
-	return controller.Watch(
-		source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
+	b = b.Watches(
+		&clusterv1.Cluster{},
 		handler.EnqueueRequestsFromMapFunc(csMachineMapper),
-		predicates.ClusterUnpausedAndInfrastructureReady(log),
+		builder.WithPredicates(
+			predicates.ClusterUnpausedAndInfrastructureReady(log)),
 	)
+
+	if err := b.Complete(reconciler); err != nil {
+		return errors.Wrap(err, "building CloudStackMachine controller")
+	}
+
+	return nil
 }

go.mod

@@ -1,29 +1,31 @@
 module sigs.k8s.io/cluster-api-provider-cloudstack
 
-go 1.22
+go 1.22.0
+
+toolchain go1.22.12
 
 require (
 	github.com/apache/cloudstack-go/v2 v2.16.1
 	github.com/go-logr/logr v1.4.2
 	github.com/golang/mock v1.6.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jellydator/ttlcache/v3 v3.2.0
-	github.com/onsi/ginkgo/v2 v2.19.0
-	github.com/onsi/gomega v1.33.1
+	github.com/onsi/ginkgo/v2 v2.19.1
+	github.com/onsi/gomega v1.34.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.18.0
 	github.com/smallfish/simpleyaml v0.1.0
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/text v0.15.0
+	golang.org/x/text v0.21.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.29.3
-	k8s.io/apimachinery v0.29.3
-	k8s.io/client-go v0.29.3
-	k8s.io/component-base v0.29.3
-	k8s.io/klog/v2 v2.110.1
+	k8s.io/api v0.30.3
+	k8s.io/apimachinery v0.30.3
+	k8s.io/client-go v0.30.3
+	k8s.io/component-base v0.30.3
+	k8s.io/klog/v2 v2.120.1
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661
-	sigs.k8s.io/cluster-api v1.7.9
-	sigs.k8s.io/controller-runtime v0.17.6
+	sigs.k8s.io/cluster-api v1.8.11
+	sigs.k8s.io/controller-runtime v0.18.7
 )
 
 require (
@@ -35,7 +37,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -49,12 +51,12 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/cel-go v0.17.7 // indirect
+	github.com/google/cel-go v0.17.8 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
@@ -66,40 +68,39 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/client_model v0.6.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
+	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
-	go.opentelemetry.io/otel v1.20.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
-	go.opentelemetry.io/otel/metric v1.20.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.20.0 // indirect
-	go.opentelemetry.io/otel/trace v1.20.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.18.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
-	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
+	google.golang.org/grpc v1.62.2 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/apiextensions-apiserver v0.29.3 // indirect
-	k8s.io/apiserver v0.29.3 // indirect
-	k8s.io/cluster-bootstrap v0.29.3 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
+	k8s.io/apiextensions-apiserver v0.30.3 // indirect
+	k8s.io/apiserver v0.30.3 // indirect
+	k8s.io/cluster-bootstrap v0.30.3 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect