fixup! refactor: Update for CAPI 1.10 APIs

jimmidyson · jimmidyson · commit c69fa7e4078c · 2025-06-03T10:39:22.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/examples/bases/docker/cluster/kustomization.yaml.tmpl b/hack/examples/bases/docker/cluster/kustomization.yaml.tmpl
@@ -24,8 +24,6 @@ patches:
     - op: "replace"
       path: "/spec/topology/class"
       value: "docker-quick-start"
-    - op: "remove"
-      path: "/spec/topology/workers/machinePools"
 - target:
     kind: Cluster
   path: ../../../patches/initialize-variables.yaml
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/make/clusterctl.mk b/make/clusterctl.mk
@@ -12,7 +12,6 @@ export CAAPH_VERSION := $(shell cd hack/third-party/caaph && GOWORK=off go list
 clusterctl.init:
 	env CLUSTER_TOPOLOGY=true \
 	    EXP_RUNTIME_SDK=true \
-	    EXP_CLUSTER_RESOURCE_SET=true \
 	    EXP_MACHINE_POOL=true \
 	    AWS_B64ENCODED_CREDENTIALS=$$(clusterctl-aws bootstrap credentials encode-as-profile) \
 	    NUTANIX_ENDPOINT="" NUTANIX_PASSWORD="" NUTANIX_USER="" \
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/generic/lifecycle/csi/handler_test.go b/pkg/handlers/generic/lifecycle/csi/handler_test.go
@@ -57,6 +57,7 @@ func testReq(csi *apivariables.CSI) (*runtimehooksv1.AfterControlPlaneInitialize
 		Cluster: clusterv1.Cluster{
 			Spec: clusterv1.ClusterSpec{
 				Topology: &clusterv1.Topology{
+					Class: "dummy-class",
 					Variables: []clusterv1.ClusterVariable{
 						*cv,
 					},
diff --git a/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go b/pkg/handlers/generic/lifecycle/servicelbgc/deleter_test.go
@@ -120,7 +120,7 @@ func Test_deleteServicesWithLoadBalancer(t *testing.T) {
 	}{{
 		name:          "no services",
 		startServices: []corev1.Service(nil),
-		endServices:   []corev1.Service(nil),
+		endServices:   []corev1.Service{},
 	}, {
 		name: "should not delete, all services with ClusterIP",
 		startServices: []corev1.Service{{
diff --git a/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler_test.go b/pkg/handlers/generic/lifecycle/serviceloadbalancer/handler_test.go
@@ -133,6 +133,7 @@ func TestAfterControlPlaneInitialized(t *testing.T) {
 				Cluster: clusterv1.Cluster{
 					Spec: clusterv1.ClusterSpec{
 						Topology: &clusterv1.Topology{
+							Class: "dummy-class",
 							Variables: []clusterv1.ClusterVariable{
 								*tt.clusterVariable,
 							},
@@ -165,6 +166,7 @@ func TestBeforeClusterUpgrade(t *testing.T) {
 				Cluster: clusterv1.Cluster{
 					Spec: clusterv1.ClusterSpec{
 						Topology: &clusterv1.Topology{
+							Class: "dummy-class",
 							Variables: []clusterv1.ClusterVariable{
 								*tt.clusterVariable,
 							},
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/inject_test.go
@@ -106,6 +106,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.100",
 					},
 				},
@@ -157,6 +158,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.29.0",
 					},
 				},
@@ -192,6 +194,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.100",
 					},
 				},
diff --git a/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/generic/mutation/controlplanevirtualip/providers/kubevip_test.go
@@ -43,6 +43,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.29.0",
 					},
 				},
@@ -81,6 +82,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.0",
 					},
 				},
@@ -114,6 +116,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.0",
 					},
 				},
@@ -146,6 +149,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.0",
 					},
 				},
diff --git a/pkg/handlers/generic/mutation/coredns/inject_test.go b/pkg/handlers/generic/mutation/coredns/inject_test.go
@@ -58,6 +58,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.30.100",
 					},
 				},
@@ -84,6 +85,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.30.100",
 					},
 				},
@@ -122,6 +124,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.30.100",
 					},
 				},
@@ -166,6 +169,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.30.100",
 					},
 				},
@@ -209,6 +213,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.30.100",
 					},
 				},
@@ -251,6 +256,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.30.100",
 					},
 				},
@@ -280,6 +286,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.100.100",
 					},
 				},
@@ -324,6 +331,7 @@ var _ = Describe("Generate CoreDNS patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "1.100.100",
 					},
 				},
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/pkg/handlers/v2/generic/mutation/controlplanevirtualip/inject_test.go b/pkg/handlers/v2/generic/mutation/controlplanevirtualip/inject_test.go
@@ -102,6 +102,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.100",
 					},
 				},
@@ -181,6 +182,7 @@ var _ = Describe("Generate ControlPlane virtual IP patches", func() {
 				},
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.29.0",
 					},
 				},
diff --git a/pkg/handlers/v2/generic/mutation/controlplanevirtualip/providers/kubevip_test.go b/pkg/handlers/v2/generic/mutation/controlplanevirtualip/providers/kubevip_test.go
@@ -50,6 +50,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.29.0",
 					},
 				},
@@ -92,6 +93,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.0",
 					},
 				},
@@ -129,6 +131,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.0",
 					},
 				},
@@ -165,6 +168,7 @@ func Test_GenerateFilesAndCommands(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				Spec: clusterv1.ClusterSpec{
 					Topology: &clusterv1.Topology{
+						Class:   "dummy-class",
 						Version: "v1.28.0",
 					},
 				},
diff --git a/pkg/webhook/cluster/webhook_suite_test.go b/pkg/webhook/cluster/webhook_suite_test.go
@@ -106,7 +106,10 @@ func TestMain(m *testing.M) {
 						Namespace: metav1.NamespaceDefault,
 					},
 					Spec: clusterv1.ClusterSpec{
-						Topology: &clusterv1.Topology{},
+						Topology: &clusterv1.Topology{
+							Class:   "dummy-class",
+							Version: "dummy-version",
+						},
 					},
 				},
 			),
diff --git a/pkg/webhook/cluster/webhook_test.go b/pkg/webhook/cluster/webhook_test.go
@@ -22,7 +22,10 @@ func TestWebhookBehaviour(t *testing.T) {
 			GenerateName: "test-cluster-",
 			Namespace:    metav1.NamespaceDefault,
 		},
-		Spec: clusterv1.ClusterSpec{Topology: &clusterv1.Topology{}},
+		Spec: clusterv1.ClusterSpec{Topology: &clusterv1.Topology{
+			Class:   "dummy-class",
+			Version: "dummy-version",
+		}},
 	}
 
 	g.Expect(env.Client.Create(ctx, cluster)).To(Succeed())
@@ -81,7 +84,10 @@ func TestUUIDIsAddedToAPreexistingClusterWhenTopologyIsAdded(t *testing.T) {
 	g.Expect(cluster.Annotations).ToNot(HaveKey(v1alpha1.ClusterUUIDAnnotationKey))
 
 	// Validate that the webhook does assign a UUID to the cluster if the Cluster has topology added.
-	cluster.Spec.Topology = &clusterv1.Topology{}
+	cluster.Spec.Topology = &clusterv1.Topology{
+		Class:   "dummy-class",
+		Version: "dummy-version",
+	}
 	g.Expect(env.Client.Update(ctx, cluster)).To(Succeed())
 	g.Expect(cluster.Annotations).
 		To(HaveKeyWithValue(v1alpha1.ClusterUUIDAnnotationKey, Not(BeEmpty())))
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/data/shared/v1beta1/metadata.yaml b/test/e2e/data/shared/v1beta1/metadata.yaml
@@ -8,6 +8,9 @@
 # update this file only when a new major or minor version is released
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 releaseSeries:
+  - major: 1
+    minor: 10
+    contract: v1beta1
   - major: 1
     minor: 9
     contract: v1beta1
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
diff --git a/test/e2e/nfd_helpers.go b/test/e2e/nfd_helpers.go
diff --git a/test/e2e/ownerreference_helpers.go b/test/e2e/ownerreference_helpers.go
diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go

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,`