fixup! refactor: Add dummy class to satisfy updated webhook

Author: jimmidyson

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{{

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",
 					},
 				},

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",
 					},
 				},

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",
 					},
 				},

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: "v1.29.0",
+						},
 					},
 				},
 			),

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: "v1.29.0",
+		}},
 	}
 
 	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: "v1.29.0",
+	}
 	g.Expect(env.Client.Update(ctx, cluster)).To(Succeed())
 	g.Expect(cluster.Annotations).
 		To(HaveKeyWithValue(v1alpha1.ClusterUUIDAnnotationKey, Not(BeEmpty())))