Upgrade CAPI to 1.7

Author: vishesh92

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

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta2_test
 
 import (
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	capcv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
 
 	"github.com/onsi/ginkgo/v2"
@@ -43,7 +43,7 @@ var _ = ginkgo.Describe("CloudStackMachineConfig_CompressUserdata", func() {
 			Name: "is false when uncompressed user data is true",
 			Machine: capcv1.CloudStackMachine{
 				Spec: capcv1.CloudStackMachineSpec{
-					UncompressedUserData: pointer.Bool(true),
+					UncompressedUserData: ptr.To(true),
 				},
 			},
 			Expect: false,
@@ -52,7 +52,7 @@ var _ = ginkgo.Describe("CloudStackMachineConfig_CompressUserdata", func() {
 			Name: "Is false when uncompressed user data is false",
 			Machine: capcv1.CloudStackMachine{
 				Spec: capcv1.CloudStackMachineSpec{
-					UncompressedUserData: pointer.Bool(false),
+					UncompressedUserData: ptr.To(false),
 				},
 			},
 			Expect: true,

config/manager/manager.yaml

@@ -24,7 +24,8 @@ spec:
         - /manager
         args:
         - "--leader-elect"
-        - "--metrics-bind-addr=localhost:8080"
+        - "--diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}"
+        - "--insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}"
         - "--cloudstackcluster-concurrency=${CAPC_CLOUDSTACKCLUSTER_CONCURRENCY:=10}"
         - "--cloudstackmachine-concurrency=${CAPC_CLOUDSTACKMACHINE_CONCURRENCY:=10}"
         - "--enable-cloudstack-cks-sync=${CAPC_CLOUDSTACKMACHINE_CKS_SYNC:=false}"

controllers/cks_machine_controller_test.go

@@ -21,7 +21,8 @@ import (
 	ginkgo "github.com/onsi/ginkgo/v2"
 	gomega "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
+
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/controllers"
 	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta3"
@@ -34,7 +35,7 @@ var _ = ginkgo.Describe("CksCloudStackMachineReconciler", func() {
 	ginkgo.Context("With machine controller running.", func() {
 		ginkgo.BeforeEach(func() {
 			dummies.SetDummyVars()
-			dummies.CSCluster.Spec.SyncWithACS = pointer.Bool(true)
+			dummies.CSCluster.Spec.SyncWithACS = ptr.To(true)
 			dummies.CSCluster.Spec.FailureDomains = dummies.CSCluster.Spec.FailureDomains[:1]
 			dummies.CSCluster.Spec.FailureDomains[0].Name = dummies.CSFailureDomain1.Spec.Name
 			dummies.CSCluster.Status.CloudStackClusterID = "cluster-id-123"

controllers/cloudstackfailuredomain_controller_test.go

@@ -21,7 +21,7 @@ import (
 	ginkgo "github.com/onsi/ginkgo/v2"
 	gomega "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
 	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta3"
@@ -117,17 +117,17 @@ var _ = ginkgo.Describe("CloudStackFailureDomainReconciler", func() {
 
 			},
 			// should delete - simulate owner is kubeadmcontrolplane
-			ginkgo.Entry("Should delete machine if spec.replicas > 1", true, pointer.Int32(2), pointer.Int32(2), pointer.Int32(2), pointer.Bool(true), true),
+			ginkgo.Entry("Should delete machine if spec.replicas > 1", true, ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(true), true),
 			// should delete - simulate owner is etcdadmcluster
-			ginkgo.Entry("Should delete machine if status.readyReplica does not exist", true, pointer.Int32(2), pointer.Int32(2), nil, pointer.Bool(true), true),
+			ginkgo.Entry("Should delete machine if status.readyReplica does not exist", true, ptr.To(int32(2)), ptr.To(int32(2)), nil, ptr.To(true), true),
 			// should delete - simulate owner is machineset
-			ginkgo.Entry("Should delete machine if status.ready does not exist", true, pointer.Int32(2), pointer.Int32(2), pointer.Int32(2), nil, true),
+			ginkgo.Entry("Should delete machine if status.ready does not exist", true, ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(int32(2)), nil, true),
 			// should not delete if condition not met
-			ginkgo.Entry("Should not delete machine if cluster control plane not ready", false, pointer.Int32(2), pointer.Int32(2), pointer.Int32(2), pointer.Bool(true), false),
-			ginkgo.Entry("Should not delete machine if status.replicas < spec.replicas", false, pointer.Int32(2), pointer.Int32(1), pointer.Int32(1), pointer.Bool(true), true),
-			ginkgo.Entry("Should not delete machine if spec.replicas < 2", false, pointer.Int32(1), pointer.Int32(1), pointer.Int32(1), pointer.Bool(true), true),
-			ginkgo.Entry("Should not delete machine if status.ready is false", false, pointer.Int32(2), pointer.Int32(2), pointer.Int32(2), pointer.Bool(false), true),
-			ginkgo.Entry("Should not delete machine if status.readyReplicas <> status.replicas", false, pointer.Int32(2), pointer.Int32(2), pointer.Int32(1), pointer.Bool(true), true),
+			ginkgo.Entry("Should not delete machine if cluster control plane not ready", false, ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(true), false),
+			ginkgo.Entry("Should not delete machine if status.replicas < spec.replicas", false, ptr.To(int32(2)), ptr.To(int32(1)), ptr.To(int32(1)), ptr.To(true), true),
+			ginkgo.Entry("Should not delete machine if spec.replicas < 2", false, ptr.To(int32(1)), ptr.To(int32(1)), ptr.To(int32(1)), ptr.To(true), true),
+			ginkgo.Entry("Should not delete machine if status.ready is false", false, ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(false), true),
+			ginkgo.Entry("Should not delete machine if status.readyReplicas <> status.replicas", false, ptr.To(int32(2)), ptr.To(int32(2)), ptr.To(int32(1)), ptr.To(true), true),
 		)
 	})
 })

controllers/cloudstackmachine_controller.go

@@ -24,12 +24,11 @@ import (
 	"regexp"
 	"time"
 
-	"k8s.io/utils/pointer"
-
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/predicates"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -331,8 +330,8 @@ func (r *CloudStackMachineReconciliationRunner) ReconcileDelete() (retRes ctrl.R
 		// ResolveVMInstanceDetails can get InstanceID by CS machine name
 		err := r.CSClient.ResolveVMInstanceDetails(r.ReconciliationSubject)
 		if err != nil {
-			r.ReconciliationSubject.Status.Status = pointer.String(metav1.StatusFailure)
-			r.ReconciliationSubject.Status.Reason = pointer.String(err.Error() +
+			r.ReconciliationSubject.Status.Status = ptr.To(metav1.StatusFailure)
+			r.ReconciliationSubject.Status.Reason = ptr.To(err.Error() +
 				fmt.Sprintf(" If this VM has already been deleted, please remove the finalizer named %s from object %s",
 					"cloudstackmachine.infrastructure.cluster.x-k8s.io", r.ReconciliationSubject.Name))
 			// Cloudstack VM may be not found or more than one found by name

controllers/cloudstackmachine_controller_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
 	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta3"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -121,7 +121,7 @@ var _ = ginkgo.Describe("CloudStackMachineReconciler", func() {
 		})
 
 		ginkgo.It("Should call ResolveVMInstanceDetails when CS machine without instanceID deleted", func() {
-			instanceID := pointer.String("instance-id-123")
+			instanceID := ptr.To("instance-id-123")
 			// Mock a call to GetOrCreateVMInstance and set the machine to running.
 			mockCloudClient.EXPECT().GetOrCreateVMInstance(
 				gomock.Any(), gomock.Any(), gomock.Any(),

controllers/controllers_suite_test.go

@@ -34,7 +34,6 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/klogr"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
 	"github.com/go-logr/logr"
@@ -158,7 +157,7 @@ var _ = ginkgo.BeforeSuite(func() {
 	gomega.Ω(flag.Lookup("v").Value.Set("1")).Should(gomega.Succeed())
 	flag.Parse()
 
-	logger = klogr.New()
+	logger = klog.Background()
 })
 
 // A mock fo the CloudClient interface used in controller utils.

controllers/utils/base_reconciler_test.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/golang/mock/gomock"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
@@ -46,7 +46,7 @@ func (m *mockConcreteRunner) Reconcile() (ctrl.Result, error) {
 	return ctrl.Result{}, nil
 }
 
-var _ = Describe("ReconciliationRunner", func() {
+var _ = ginkgo.Describe("ReconciliationRunner", func() {
 	var (
 		mockCtrl   *gomock.Controller
 		k8sClient  client.Client
@@ -56,11 +56,11 @@ var _ = Describe("ReconciliationRunner", func() {
 		mockRunner *mockConcreteRunner
 	)
 
-	BeforeEach(func() {
-		mockCtrl = gomock.NewController(GinkgoT())
+	ginkgo.BeforeEach(func() {
+		mockCtrl = gomock.NewController(ginkgo.GinkgoT())
 		scheme = runtime.NewScheme()
-		Expect(infrav1.AddToScheme(scheme)).To(Succeed())
-		Expect(clusterv1.AddToScheme(scheme)).To(Succeed())
+		gomega.Expect(infrav1.AddToScheme(scheme)).To(gomega.Succeed())
+		gomega.Expect(clusterv1.AddToScheme(scheme)).To(gomega.Succeed())
 
 		k8sClient = fake.NewClientBuilder().WithScheme(scheme).Build()
 		ctx = context.Background()
@@ -88,16 +88,16 @@ var _ = Describe("ReconciliationRunner", func() {
 		})
 	})
 
-	AfterEach(func() {
+	ginkgo.AfterEach(func() {
 		mockCtrl.Finish()
 	})
 
-	Describe("GetParent", func() {
+	ginkgo.Describe("GetParent", func() {
 		var (
 			child *infrav1.CloudStackMachine
 		)
 
-		BeforeEach(func() {
+		ginkgo.BeforeEach(func() {
 			dummies.SetDummyVars()
 
 			// Set up child object
@@ -109,9 +109,9 @@ var _ = Describe("ReconciliationRunner", func() {
 			}
 		})
 
-		Context("when parent exists and is correctly referenced", func() {
+		ginkgo.Context("when parent exists and is correctly referenced", func() {
 			var parent *clusterv1.Machine
-			BeforeEach(func() {
+			ginkgo.BeforeEach(func() {
 				parent = &clusterv1.Machine{
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "test-parent",
@@ -129,27 +129,27 @@ var _ = Describe("ReconciliationRunner", func() {
 				}
 
 				// Create the objects in the fake client
-				Expect(k8sClient.Create(ctx, parent)).To(Succeed())
-				Expect(k8sClient.Create(ctx, child)).To(Succeed())
+				gomega.Expect(k8sClient.Create(ctx, parent)).To(gomega.Succeed())
+				gomega.Expect(k8sClient.Create(ctx, child)).To(gomega.Succeed())
 			})
 
-			It("should find the parent successfully", func() {
+			ginkgo.It("should find the parent successfully", func() {
 				// Create an empty parent object to be filled
 				parentToFind := &clusterv1.Machine{}
 
 				// Call GetParent
 				result, err := baseRunner.GetParent(child, parentToFind)()
 
 				// Check results
-				Expect(err).NotTo(HaveOccurred())
-				Expect(result).To(Equal(ctrl.Result{}))
-				Expect(parentToFind.Name).To(Equal(parent.Name))
-				Expect(parentToFind.Namespace).To(Equal(parent.Namespace))
+				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+				gomega.Expect(result).To(gomega.Equal(ctrl.Result{}))
+				gomega.Expect(parentToFind.Name).To(gomega.Equal(parent.Name))
+				gomega.Expect(parentToFind.Namespace).To(gomega.Equal(parent.Namespace))
 			})
 		})
 
-		Context("when parent doesn't exist", func() {
-			BeforeEach(func() {
+		ginkgo.Context("when parent doesn't exist", func() {
+			ginkgo.BeforeEach(func() {
 				// Set up owner reference to non-existent parent
 				child.OwnerReferences = []metav1.OwnerReference{
 					{
@@ -161,24 +161,24 @@ var _ = Describe("ReconciliationRunner", func() {
 				}
 
 				// Create only the child in the fake client
-				Expect(k8sClient.Create(ctx, child)).To(Succeed())
+				gomega.Expect(k8sClient.Create(ctx, child)).To(gomega.Succeed())
 			})
 
-			It("should return an error", func() {
+			ginkgo.It("should return an error", func() {
 				// Create an empty parent object to be filled
 				parentToFind := &clusterv1.Machine{}
 
 				// Call GetParent
 				_, err := baseRunner.GetParent(child, parentToFind)()
 
 				// Check results
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("not found"))
+				gomega.Expect(err).To(gomega.HaveOccurred())
+				gomega.Expect(err.Error()).To(gomega.ContainSubstring("not found"))
 			})
 		})
 
-		Context("when no owner reference of requested kind exists", func() {
-			BeforeEach(func() {
+		ginkgo.Context("when no owner reference of requested kind exists", func() {
+			ginkgo.BeforeEach(func() {
 				// Set up owner reference to different kind
 				child.OwnerReferences = []metav1.OwnerReference{
 					{
@@ -190,19 +190,19 @@ var _ = Describe("ReconciliationRunner", func() {
 				}
 
 				// Create only the child in the fake client
-				Expect(k8sClient.Create(ctx, child)).To(Succeed())
+				gomega.Expect(k8sClient.Create(ctx, child)).To(gomega.Succeed())
 			})
 
-			It("should requeue with error message", func() {
+			ginkgo.It("should requeue with error message", func() {
 				// Create an empty parent object to be filled
 				parentToFind := &clusterv1.Machine{}
 
 				// Call GetParent
 				result, err := baseRunner.GetParent(child, parentToFind)()
 
 				// Check results
-				Expect(err).NotTo(HaveOccurred())
-				Expect(result.RequeueAfter).To(Equal(utils.RequeueTimeout))
+				gomega.Expect(err).NotTo(gomega.HaveOccurred())
+				gomega.Expect(result.RequeueAfter).To(gomega.Equal(utils.RequeueTimeout))
 			})
 		})
 	})

controllers/utils/utils_suite_test.go

@@ -19,11 +19,11 @@ package utils_test
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	"github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
 )
 
 func TestUtils(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Utils Suite")
+	gomega.RegisterFailHandler(ginkgo.Fail)
+	ginkgo.RunSpecs(t, "Utils Suite")
 }