fixup! refactor: Update for CAPI v1.10.0 changes

jimmidyson · jimmidyson · commit abac7371e633 · 2025-04-28T12:06:52.000+01:00
diff --git a/cmd/main.go b/cmd/main.go
@@ -18,8 +18,8 @@ import (
 	logsv1 "k8s.io/component-base/logs/api/v1"
 	"k8s.io/component-base/version/verflag"
 	"k8s.io/klog/v2"
+	crsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	crsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -3,7 +3,8 @@
 
 module github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/hack/tools
 
-go 1.22.5
+go 1.23.0
+
 toolchain go1.24.1
 
 require (
diff --git a/internal/test/envtest/environment.go b/internal/test/envtest/environment.go
@@ -39,11 +39,11 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog/v2"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/log"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
 	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
 	runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1"
diff --git a/pkg/controllers/namespacesync/references.go b/pkg/controllers/namespacesync/references.go
@@ -67,7 +67,9 @@ func walkReferences(
 		}
 	}
 
-	for _, md := range cc.Spec.Workers.MachineDeployments {
+	for mdIdx := range cc.Spec.Workers.MachineDeployments {
+		md := &cc.Spec.Workers.MachineDeployments[mdIdx]
+
 		for _, ref := range []*corev1.ObjectReference{
 			md.Template.Infrastructure.Ref,
 			md.Template.Bootstrap.Ref,
diff --git a/pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_crs.go b/pkg/handlers/generic/lifecycle/clusterautoscaler/strategy_crs.go
@@ -11,9 +11,9 @@ import (
 	"github.com/spf13/pflag"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	crsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/remote"
-	crsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/client"
diff --git a/pkg/handlers/utils/utils.go b/pkg/handlers/utils/utils.go
@@ -12,8 +12,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	crsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	crsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
diff --git a/test/e2e/ccm_helpers.go b/test/e2e/ccm_helpers.go
@@ -15,8 +15,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
diff --git a/test/e2e/clusterautoscaler_helpers.go b/test/e2e/clusterautoscaler_helpers.go
@@ -18,8 +18,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/yaml"
 
diff --git a/test/e2e/cni_helpers.go b/test/e2e/cni_helpers.go
@@ -15,8 +15,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
diff --git a/test/e2e/csi_helpers.go b/test/e2e/csi_helpers.go
@@ -19,8 +19,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	capie2e "sigs.k8s.io/cluster-api/test/e2e"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/test/e2e/framework/nutanix/client.go b/test/e2e/framework/nutanix/client.go
@@ -29,10 +29,10 @@ const (
 
 func CredentialsFromCAPIE2EConfig(e2eConfig *clusterctl.E2EConfig) *prismgoclient.Credentials {
 	return &prismgoclient.Credentials{
-		Endpoint: e2eConfig.GetVariable(prismEndpointVariableName),
-		Port:     e2eConfig.GetVariable(prismPortVariableName),
-		Username: e2eConfig.GetVariable(prismUsernameVariableName),
-		Password: e2eConfig.GetVariable(prismPasswordVariableName),
+		Endpoint: e2eConfig.MustGetVariable(prismEndpointVariableName),
+		Port:     e2eConfig.MustGetVariable(prismPortVariableName),
+		Username: e2eConfig.MustGetVariable(prismUsernameVariableName),
+		Password: e2eConfig.MustGetVariable(prismPasswordVariableName),
 		Insecure: false,
 	}
 }
diff --git a/test/e2e/framework/self_hosted.go b/test/e2e/framework/self_hosted.go
@@ -122,7 +122,7 @@ func SelfHostedSpec(ctx context.Context, inputGetter func() SelfHostedSpecInput)
 
 		// Use KubernetesVersion if no upgrade step is defined by test input.
 		Expect(input.E2EConfig.Variables).To(HaveKey(capie2e.KubernetesVersion))
-		kubernetesVersion = input.E2EConfig.GetVariable(capie2e.KubernetesVersion)
+		kubernetesVersion = input.E2EConfig.MustGetVariable(capie2e.KubernetesVersion)
 
 		// Setup a Namespace where to host objects for this spec and create a watcher for the namespace events.
 		namespace, cancelWatches = setupSpecNamespace(
@@ -501,8 +501,8 @@ func dumpSpecResourcesAndCleanup(
 		capie2eframework.DeleteAllClustersAndWait(
 			ctx,
 			capie2eframework.DeleteAllClustersAndWaitInput{
-				Client:    clusterProxy.GetClient(),
-				Namespace: namespace.Name,
+				ClusterProxy: clusterProxy,
+				Namespace:    namespace.Name,
 			},
 			intervalsGetter(specName, "wait-delete-cluster")...)
 
diff --git a/test/e2e/nfd_helpers.go b/test/e2e/nfd_helpers.go
@@ -15,8 +15,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
diff --git a/test/e2e/ownerreference_helpers.go b/test/e2e/ownerreference_helpers.go
@@ -12,11 +12,11 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
+	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	clusterctlcluster "sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
-	addonsv1 "sigs.k8s.io/cluster-api/exp/addons/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
 
 	capxv1 "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1"
diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go
@@ -80,7 +80,7 @@ var _ = Describe("Quick start", func() {
 											lowercaseProvider,
 										)
 										if testE2EConfig.HasVariable(varName) {
-											testE2EConfig.Variables[capie2e.KubernetesVersion] = testE2EConfig.GetVariable(
+											testE2EConfig.Variables[capie2e.KubernetesVersion] = testE2EConfig.MustGetVariable(
 												varName,
 											)
 										}
@@ -97,8 +97,10 @@ var _ = Describe("Quick start", func() {
 											Expect(err).ToNot(HaveOccurred())
 
 											controlPlaneEndpointIP, unreserveControlPlaneEndpointIP, err := nutanix.ReserveIP(
-												testE2EConfig.GetVariable("NUTANIX_SUBNET_NAME"),
-												testE2EConfig.GetVariable(
+												testE2EConfig.MustGetVariable(
+													"NUTANIX_SUBNET_NAME",
+												),
+												testE2EConfig.MustGetVariable(
 													"NUTANIX_PRISM_ELEMENT_CLUSTER_NAME",
 												),
 												nutanixClient,
@@ -227,7 +229,7 @@ var _ = Describe("Quick start", func() {
 													ctx,
 													capiframework.WaitForNodesReadyInput{
 														Lister: workloadClient,
-														KubernetesVersion: testE2EConfig.GetVariable(
+														KubernetesVersion: testE2EConfig.MustGetVariable(
 															capie2e.KubernetesVersion,
 														),
 														Count: nodeCount,

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,9 @@ func walkReferences(`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- for _, md := range cc.Spec.Workers.MachineDeployments {`
	`70`	`+ for mdIdx := range cc.Spec.Workers.MachineDeployments {`
	`71`	`+ md := &cc.Spec.Workers.MachineDeployments[mdIdx]`
	`72`	`+`
`71`	`73`	`for _, ref := range []*corev1.ObjectReference{`
`72`	`74`	`md.Template.Infrastructure.Ref,`
`73`	`75`	`md.Template.Bootstrap.Ref,`