Skip to content

Commit 341c983

Browse files
sbueringersbueringer
committed
Fix unit tests
1 parent d35e8dc commit 341c983

File tree

16 files changed

+224
-11
lines changed

16 files changed

+224
-11
lines changed

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_reconciler_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525

2626
bootstrapv1 "sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2"
27+
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
2728
"sigs.k8s.io/cluster-api/util/test/builder"
2829
)
2930

@@ -35,7 +36,11 @@ func TestKubeadmConfigReconciler(t *testing.T) {
3536
ns, err := env.CreateNamespace(ctx, "test-kubeadm-config-reconciler")
3637
g.Expect(err).ToNot(HaveOccurred())
3738

38-
cluster := builder.Cluster(ns.Name, "cluster1").Build()
39+
cluster := builder.Cluster(ns.Name, "cluster1").
40+
WithClusterNetwork(&clusterv1.ClusterNetwork{
41+
ServiceDomain: "service.domain",
42+
}).
43+
Build()
3944
g.Expect(env.Create(ctx, cluster)).To(Succeed())
4045
machine := newWorkerMachineForCluster(cluster)
4146
g.Expect(env.Create(ctx, machine)).To(Succeed())

‎controllers/clustercache/cluster_accessor_test.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ func TestConnect(t *testing.T) {
5151
Name: "test-cluster",
5252
Namespace: metav1.NamespaceDefault,
5353
},
54+
Spec: clusterv1.ClusterSpec{
55+
ClusterNetwork: &clusterv1.ClusterNetwork{
56+
ServiceDomain: "service.domain",
57+
},
58+
},
5459
}
5560
clusterKey := client.ObjectKeyFromObject(testCluster)
5661
g.Expect(env.CreateAndWait(ctx, testCluster)).To(Succeed())
@@ -147,6 +152,11 @@ func TestDisconnect(t *testing.T) {
147152
Name: "test-cluster",
148153
Namespace: metav1.NamespaceDefault,
149154
},
155+
Spec: clusterv1.ClusterSpec{
156+
ClusterNetwork: &clusterv1.ClusterNetwork{
157+
ServiceDomain: "service.domain",
158+
},
159+
},
150160
}
151161
clusterKey := client.ObjectKeyFromObject(testCluster)
152162
g.Expect(env.CreateAndWait(ctx, testCluster)).To(Succeed())
@@ -196,6 +206,11 @@ func TestHealthCheck(t *testing.T) {
196206
Name: "test-cluster",
197207
Namespace: metav1.NamespaceDefault,
198208
},
209+
Spec: clusterv1.ClusterSpec{
210+
ClusterNetwork: &clusterv1.ClusterNetwork{
211+
ServiceDomain: "service.domain",
212+
},
213+
},
199214
}
200215
clusterKey := client.ObjectKeyFromObject(testCluster)
201216

@@ -307,6 +322,11 @@ func TestWatch(t *testing.T) {
307322
Name: "test-cluster",
308323
Namespace: metav1.NamespaceDefault,
309324
},
325+
Spec: clusterv1.ClusterSpec{
326+
ClusterNetwork: &clusterv1.ClusterNetwork{
327+
ServiceDomain: "service.domain",
328+
},
329+
},
310330
}
311331
clusterKey := client.ObjectKeyFromObject(testCluster)
312332
g.Expect(env.CreateAndWait(ctx, testCluster)).To(Succeed())

‎controllers/clustercache/cluster_cache_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ func TestReconcile(t *testing.T) {
5757
Name: "test-cluster",
5858
Namespace: metav1.NamespaceDefault,
5959
},
60+
Spec: clusterv1.ClusterSpec{
61+
ClusterNetwork: &clusterv1.ClusterNetwork{
62+
ServiceDomain: "service.domain",
63+
},
64+
},
6065
}
6166
clusterKey := client.ObjectKeyFromObject(testCluster)
6267
g.Expect(env.CreateAndWait(ctx, testCluster)).To(Succeed())
@@ -732,6 +737,11 @@ func createCluster(g Gomega, testCluster testCluster) {
732737
Name: testCluster.cluster.Name,
733738
Namespace: testCluster.cluster.Namespace,
734739
},
740+
Spec: clusterv1.ClusterSpec{
741+
ClusterNetwork: &clusterv1.ClusterNetwork{
742+
ServiceDomain: "service.domain",
743+
},
744+
},
735745
}
736746
g.Expect(env.CreateAndWait(ctx, cluster)).To(Succeed())
737747

‎controlplane/kubeadm/internal/cluster_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ func TestGetWorkloadCluster(t *testing.T) {
118118
Name: "my-cluster",
119119
Namespace: ns.Name,
120120
},
121+
Spec: clusterv1.ClusterSpec{
122+
ClusterNetwork: &clusterv1.ClusterNetwork{
123+
ServiceDomain: "service.domain",
124+
},
125+
},
121126
}
122127
g.Expect(env.CreateAndWait(ctx, cluster)).To(Succeed())
123128
defer func(do client.Object) {

‎controlplane/kubeadm/internal/controllers/controller_test.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,17 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
16431643
g.Expect(err).ToNot(HaveOccurred())
16441644

16451645
t.Log("Creating the Cluster")
1646-
cluster := &clusterv1.Cluster{ObjectMeta: metav1.ObjectMeta{Namespace: ns.Name, Name: "test-cluster"}}
1646+
cluster := &clusterv1.Cluster{
1647+
ObjectMeta: metav1.ObjectMeta{
1648+
Namespace: ns.Name,
1649+
Name: "test-cluster",
1650+
},
1651+
Spec: clusterv1.ClusterSpec{
1652+
ClusterNetwork: &clusterv1.ClusterNetwork{
1653+
ServiceDomain: "service.domain",
1654+
},
1655+
},
1656+
}
16471657
g.Expect(env.Create(ctx, cluster)).To(Succeed())
16481658

16491659
t.Log("Creating the Cluster Kubeconfig Secret")

‎exp/internal/controllers/machinepool_controller_phases_test.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,11 @@ func TestReconcileMachinePoolMachines(t *testing.T) {
13501350
ns, err := env.CreateNamespace(ctx, "test-machinepool-machines")
13511351
g.Expect(err).ToNot(HaveOccurred())
13521352

1353-
cluster := builder.Cluster(ns.Name, clusterName).Build()
1353+
cluster := builder.Cluster(ns.Name, clusterName).
1354+
WithClusterNetwork(&clusterv1.ClusterNetwork{
1355+
ServiceDomain: "service.domain",
1356+
}).
1357+
Build()
13541358
g.Expect(env.CreateAndWait(ctx, cluster)).To(Succeed())
13551359

13561360
t.Run("Should do nothing if machines already exist", func(*testing.T) {
@@ -1719,6 +1723,11 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {
17191723
GenerateName: "machinepool-scale-zero-",
17201724
Namespace: ns.Name,
17211725
},
1726+
Spec: clusterv1.ClusterSpec{
1727+
ClusterNetwork: &clusterv1.ClusterNetwork{
1728+
ServiceDomain: "service.domain",
1729+
},
1730+
},
17221731
}
17231732
g.Expect(env.CreateAndWait(ctx, testCluster)).To(Succeed())
17241733
g.Expect(env.CreateKubeconfigSecret(ctx, testCluster)).To(Succeed())

‎internal/controllers/cluster/cluster_controller_test.go

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,11 @@ func TestClusterReconciler(t *testing.T) {
6464
GenerateName: "test1-",
6565
Namespace: ns.Name,
6666
},
67-
Spec: clusterv1.ClusterSpec{},
67+
Spec: clusterv1.ClusterSpec{
68+
ClusterNetwork: &clusterv1.ClusterNetwork{
69+
ServiceDomain: "service.domain",
70+
},
71+
},
6872
}
6973

7074
// Create the Cluster object and expect the Reconcile and Deployment to be created
@@ -115,6 +119,11 @@ func TestClusterReconciler(t *testing.T) {
115119
GenerateName: "test2-",
116120
Namespace: ns.Name,
117121
},
122+
Spec: clusterv1.ClusterSpec{
123+
ClusterNetwork: &clusterv1.ClusterNetwork{
124+
ServiceDomain: "service.domain",
125+
},
126+
},
118127
}
119128
g.Expect(env.Create(ctx, cluster)).To(Succeed())
120129
key := client.ObjectKey{Name: cluster.Name, Namespace: cluster.Namespace}
@@ -169,6 +178,11 @@ func TestClusterReconciler(t *testing.T) {
169178
GenerateName: "test3-",
170179
Namespace: ns.Name,
171180
},
181+
Spec: clusterv1.ClusterSpec{
182+
ClusterNetwork: &clusterv1.ClusterNetwork{
183+
ServiceDomain: "service.domain",
184+
},
185+
},
172186
}
173187
g.Expect(env.Create(ctx, cluster)).To(Succeed())
174188
key := client.ObjectKey{Name: cluster.Name, Namespace: cluster.Namespace}
@@ -216,6 +230,11 @@ func TestClusterReconciler(t *testing.T) {
216230
GenerateName: "test3-",
217231
Namespace: ns.Name,
218232
},
233+
Spec: clusterv1.ClusterSpec{
234+
ClusterNetwork: &clusterv1.ClusterNetwork{
235+
ServiceDomain: "service.domain",
236+
},
237+
},
219238
}
220239
g.Expect(env.Create(ctx, cluster)).To(Succeed())
221240
key := client.ObjectKey{Name: cluster.Name, Namespace: cluster.Namespace}
@@ -264,6 +283,11 @@ func TestClusterReconciler(t *testing.T) {
264283
GenerateName: "test4-",
265284
Namespace: ns.Name,
266285
},
286+
Spec: clusterv1.ClusterSpec{
287+
ClusterNetwork: &clusterv1.ClusterNetwork{
288+
ServiceDomain: "service.domain",
289+
},
290+
},
267291
}
268292

269293
g.Expect(env.Create(ctx, cluster)).To(Succeed())
@@ -319,6 +343,11 @@ func TestClusterReconciler(t *testing.T) {
319343
GenerateName: "test5-",
320344
Namespace: ns.Name,
321345
},
346+
Spec: clusterv1.ClusterSpec{
347+
ClusterNetwork: &clusterv1.ClusterNetwork{
348+
ServiceDomain: "service.domain",
349+
},
350+
},
322351
}
323352
g.Expect(env.Create(ctx, cluster)).To(Succeed())
324353
key := client.ObjectKey{Name: cluster.Name, Namespace: cluster.Namespace}
@@ -364,6 +393,11 @@ func TestClusterReconciler(t *testing.T) {
364393
GenerateName: "test6-",
365394
Namespace: ns.Name,
366395
},
396+
Spec: clusterv1.ClusterSpec{
397+
ClusterNetwork: &clusterv1.ClusterNetwork{
398+
ServiceDomain: "service.domain",
399+
},
400+
},
367401
}
368402

369403
g.Expect(env.Create(ctx, cluster)).To(Succeed())

‎internal/controllers/clusterresourceset/clusterresourceset_controller_test.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,17 @@ metadata:
106106
g.Expect(err).ToNot(HaveOccurred())
107107

108108
clusterName = fmt.Sprintf("cluster-%s", util.RandomString(6))
109-
testCluster = &clusterv1.Cluster{ObjectMeta: metav1.ObjectMeta{Name: clusterName, Namespace: ns.Name}}
109+
testCluster = &clusterv1.Cluster{
110+
ObjectMeta: metav1.ObjectMeta{
111+
Name: clusterName,
112+
Namespace: ns.Name,
113+
},
114+
Spec: clusterv1.ClusterSpec{
115+
ClusterNetwork: &clusterv1.ClusterNetwork{
116+
ServiceDomain: "service.domain",
117+
},
118+
},
119+
}
110120

111121
t.Log("Creating the Cluster")
112122
g.Expect(env.CreateAndWait(ctx, testCluster)).To(Succeed())

‎internal/controllers/machine/machine_controller_noderef_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,11 @@ func TestGetNode(t *testing.T) {
238238
GenerateName: "test-get-node-",
239239
Namespace: ns.Name,
240240
},
241+
Spec: clusterv1.ClusterSpec{
242+
ClusterNetwork: &clusterv1.ClusterNetwork{
243+
ServiceDomain: "service.domain",
244+
},
245+
},
241246
}
242247

243248
g.Expect(env.Create(ctx, testCluster)).To(Succeed())
@@ -381,6 +386,11 @@ func TestNodeLabelSync(t *testing.T) {
381386
Name: "test-cluster",
382387
Namespace: metav1.NamespaceDefault,
383388
},
389+
Spec: clusterv1.ClusterSpec{
390+
ClusterNetwork: &clusterv1.ClusterNetwork{
391+
ServiceDomain: "service.domain",
392+
},
393+
},
384394
}
385395

386396
defaultInfraMachine := &unstructured.Unstructured{

‎internal/controllers/machine/machine_controller_status_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,6 +1905,11 @@ func TestReconcileMachinePhases(t *testing.T) {
19051905
Name: "test-cluster",
19061906
Namespace: metav1.NamespaceDefault,
19071907
},
1908+
Spec: clusterv1.ClusterSpec{
1909+
ClusterNetwork: &clusterv1.ClusterNetwork{
1910+
ServiceDomain: "service.domain",
1911+
},
1912+
},
19081913
}
19091914

19101915
defaultMachine := clusterv1.Machine{

0 commit comments

Comments
 (0)