Skip to content

Commit 2a010f0

Browse files
sbueringersbueringer
committed
Stop setting TypeMeta in unit tests
Signed-off-by: Stefan Büringer [email protected]
1 parent 6405238 commit 2a010f0

File tree

34 files changed

+42
-360
lines changed

34 files changed

+42
-360
lines changed

‎bootstrap/kubeadm/internal/builder/builders.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,14 @@ func (k *KubeadmConfigBuilder) Unstructured() *unstructured.Unstructured {
6767
if err != nil {
6868
panic(err)
6969
}
70-
return &unstructured.Unstructured{Object: rawMap}
70+
u := &unstructured.Unstructured{Object: rawMap}
71+
u.SetGroupVersionKind(bootstrapv1.GroupVersion.WithKind("KubeadmConfig"))
72+
return u
7173
}
7274

7375
// Build produces a KubeadmConfig from the variable in the KubeadmConfigBuilder.
7476
func (k *KubeadmConfigBuilder) Build() *bootstrapv1.KubeadmConfig {
7577
config := &bootstrapv1.KubeadmConfig{
76-
TypeMeta: metav1.TypeMeta{
77-
Kind: "KubeadmConfig",
78-
APIVersion: bootstrapv1.GroupVersion.String(),
79-
},
8078
ObjectMeta: metav1.ObjectMeta{
8179
Namespace: k.namespace,
8280
Name: k.name,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func TestKubeadmConfigReconciler_TestSecretOwnerReferenceReconciliation(t *testi
188188

189189
controllerOwner := metav1.GetControllerOf(actual)
190190
g.Expect(controllerOwner).To(Not(BeNil()))
191-
g.Expect(controllerOwner.Kind).To(Equal(config.Kind))
191+
g.Expect(controllerOwner.Kind).To(Equal("KubeadmConfig"))
192192
g.Expect(controllerOwner.Name).To(Equal(config.Name))
193193
})
194194

@@ -200,7 +200,7 @@ func TestKubeadmConfigReconciler_TestSecretOwnerReferenceReconciliation(t *testi
200200

201201
controllerOwner := metav1.GetControllerOf(actual)
202202
g.Expect(controllerOwner).To(Not(BeNil()))
203-
g.Expect(controllerOwner.Kind).To(Equal(config.Kind))
203+
g.Expect(controllerOwner.Kind).To(Equal("KubeadmConfig"))
204204
g.Expect(controllerOwner.Name).To(Equal(config.Name))
205205
})
206206
t.Run("non-KubeadmConfig controller OwnerReference is replaced", func(*testing.T) {
@@ -224,7 +224,7 @@ func TestKubeadmConfigReconciler_TestSecretOwnerReferenceReconciliation(t *testi
224224

225225
controllerOwner := metav1.GetControllerOf(actual)
226226
g.Expect(controllerOwner).To(Not(BeNil()))
227-
g.Expect(controllerOwner.Kind).To(Equal(config.Kind))
227+
g.Expect(controllerOwner.Kind).To(Equal("KubeadmConfig"))
228228
g.Expect(controllerOwner.Name).To(Equal(config.Name))
229229
})
230230
}

‎bootstrap/util/configowner_test.go‎

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ func TestHasNodeRefs(t *testing.T) {
187187
t.Run("should return false if there is no nodeRef", func(t *testing.T) {
188188
g := NewWithT(t)
189189
machine := &clusterv1.Machine{
190-
TypeMeta: metav1.TypeMeta{
191-
APIVersion: clusterv1.GroupVersion.String(),
192-
Kind: "Machine",
193-
},
194190
ObjectMeta: metav1.ObjectMeta{
195191
Name: "machine-name",
196192
Namespace: metav1.NamespaceDefault,
@@ -209,10 +205,6 @@ func TestHasNodeRefs(t *testing.T) {
209205
t.Run("should return true if there is a nodeRef for Machine", func(t *testing.T) {
210206
g := NewWithT(t)
211207
machine := &clusterv1.Machine{
212-
TypeMeta: metav1.TypeMeta{
213-
APIVersion: clusterv1.GroupVersion.String(),
214-
Kind: "Machine",
215-
},
216208
ObjectMeta: metav1.ObjectMeta{
217209
Name: "machine-name",
218210
Namespace: metav1.NamespaceDefault,
@@ -242,21 +234,13 @@ func TestHasNodeRefs(t *testing.T) {
242234
machinePools := []clusterv1.MachinePool{
243235
{
244236
// No replicas specified (default is 1). No nodeRefs either.
245-
TypeMeta: metav1.TypeMeta{
246-
APIVersion: clusterv1.GroupVersion.String(),
247-
Kind: "MachinePool",
248-
},
249237
ObjectMeta: metav1.ObjectMeta{
250238
Namespace: metav1.NamespaceDefault,
251239
Name: "machine-pool-name",
252240
},
253241
},
254242
{
255243
// 1 replica but no nodeRefs
256-
TypeMeta: metav1.TypeMeta{
257-
APIVersion: clusterv1.GroupVersion.String(),
258-
Kind: "MachinePool",
259-
},
260244
ObjectMeta: metav1.ObjectMeta{
261245
Namespace: metav1.NamespaceDefault,
262246
Name: "machine-pool-name",
@@ -267,10 +251,6 @@ func TestHasNodeRefs(t *testing.T) {
267251
},
268252
{
269253
// 2 replicas but only 1 nodeRef
270-
TypeMeta: metav1.TypeMeta{
271-
APIVersion: clusterv1.GroupVersion.String(),
272-
Kind: "MachinePool",
273-
},
274254
ObjectMeta: metav1.ObjectMeta{
275255
Namespace: metav1.NamespaceDefault,
276256
Name: "machine-pool-name",
@@ -308,10 +288,6 @@ func TestHasNodeRefs(t *testing.T) {
308288
machinePools := []clusterv1.MachinePool{
309289
{
310290
// 1 replica (default) and 1 nodeRef
311-
TypeMeta: metav1.TypeMeta{
312-
APIVersion: clusterv1.GroupVersion.String(),
313-
Kind: "MachinePool",
314-
},
315291
ObjectMeta: metav1.ObjectMeta{
316292
Namespace: metav1.NamespaceDefault,
317293
Name: "machine-pool-name",
@@ -328,10 +304,6 @@ func TestHasNodeRefs(t *testing.T) {
328304
},
329305
{
330306
// 2 replicas and nodeRefs
331-
TypeMeta: metav1.TypeMeta{
332-
APIVersion: clusterv1.GroupVersion.String(),
333-
Kind: "MachinePool",
334-
},
335307
ObjectMeta: metav1.ObjectMeta{
336308
Namespace: metav1.NamespaceDefault,
337309
Name: "machine-pool-name",
@@ -356,10 +328,6 @@ func TestHasNodeRefs(t *testing.T) {
356328
},
357329
{
358330
// 0 replicas and 0 nodeRef
359-
TypeMeta: metav1.TypeMeta{
360-
APIVersion: clusterv1.GroupVersion.String(),
361-
Kind: "MachinePool",
362-
},
363331
ObjectMeta: metav1.ObjectMeta{
364332
Namespace: metav1.NamespaceDefault,
365333
Name: "machine-pool-name",
@@ -372,12 +340,11 @@ func TestHasNodeRefs(t *testing.T) {
372340

373341
for i := range machinePools {
374342
content, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&machinePools[i])
375-
if err != nil {
376-
g.Fail(err.Error())
377-
}
378-
unstructuredOwner := unstructured.Unstructured{}
343+
g.Expect(err).ToNot(HaveOccurred())
344+
unstructuredOwner := &unstructured.Unstructured{}
379345
unstructuredOwner.SetUnstructuredContent(content)
380-
co := ConfigOwner{&unstructuredOwner}
346+
unstructuredOwner.SetGroupVersionKind(clusterv1.GroupVersion.WithKind("MachinePool"))
347+
co := ConfigOwner{unstructuredOwner}
381348

382349
result := co.HasNodeRefs()
383350
g.Expect(result).To(BeTrue())

‎controllers/external/tracker_test.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/go-logr/logr"
2323
. "github.com/onsi/gomega"
2424
"github.com/pkg/errors"
25-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2625
"k8s.io/apimachinery/pkg/runtime"
2726
"k8s.io/utils/ptr"
2827
"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
@@ -83,12 +82,7 @@ func TestWatchMultipleTimes(t *testing.T) {
8382
ctrl := &watchCountController{}
8483
tracker := ObjectTracker{Controller: ctrl, Scheme: runtime.NewScheme(), Cache: &informertest.FakeInformers{}, PredicateLogger: ptr.To(logr.New(log.NullLogSink{}))}
8584

86-
obj := &clusterv1.Cluster{
87-
TypeMeta: metav1.TypeMeta{
88-
Kind: "Cluster",
89-
APIVersion: clusterv1.GroupVersion.Version,
90-
},
91-
}
85+
obj := &clusterv1.Cluster{}
9286
err := tracker.Watch(logger, obj, nil)
9387
g.Expect(err).ToNot(HaveOccurred())
9488
g.Expect(ctrl.count).Should(Equal(1))

‎controlplane/kubeadm/internal/cluster_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,6 @@ func machineListForTestGetMachinesForCluster() *clusterv1.MachineList {
303303
}
304304
machine := func(name string) clusterv1.Machine {
305305
return clusterv1.Machine{
306-
TypeMeta: metav1.TypeMeta{},
307306
ObjectMeta: metav1.ObjectMeta{
308307
Name: name,
309308
Namespace: metav1.NamespaceDefault,

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -608,10 +608,6 @@ func TestKubeadmControlPlaneReconciler_adoption(t *testing.T) {
608608
},
609609
}
610610
cfg := &bootstrapv1.KubeadmConfig{
611-
TypeMeta: metav1.TypeMeta{
612-
APIVersion: bootstrapv1.GroupVersion.String(),
613-
Kind: "KubeadmConfig",
614-
},
615611
ObjectMeta: metav1.ObjectMeta{
616612
Namespace: cluster.Namespace,
617613
Name: name,
@@ -1749,10 +1745,6 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
17491745
Users: []bootstrapv1.User{{Name: "test-user"}},
17501746
}
17511747
existingKubeadmConfig := &bootstrapv1.KubeadmConfig{
1752-
TypeMeta: metav1.TypeMeta{
1753-
Kind: "KubeadmConfig",
1754-
APIVersion: bootstrapv1.GroupVersion.String(),
1755-
},
17561748
ObjectMeta: metav1.ObjectMeta{
17571749
Name: "existing-kubeadmconfig",
17581750
Namespace: namespace.Name,
@@ -1778,10 +1770,6 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
17781770
// Existing Machine to validate in-place mutation
17791771
fd := "fd1"
17801772
inPlaceMutatingMachine := &clusterv1.Machine{
1781-
TypeMeta: metav1.TypeMeta{
1782-
APIVersion: clusterv1.GroupVersion.String(),
1783-
Kind: "Machine",
1784-
},
17851773
ObjectMeta: metav1.ObjectMeta{
17861774
Name: "existing-machine",
17871775
Namespace: namespace.Name,
@@ -1815,10 +1803,6 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
18151803

18161804
// Existing machine that is in deleting state
18171805
deletingMachine := &clusterv1.Machine{
1818-
TypeMeta: metav1.TypeMeta{
1819-
APIVersion: clusterv1.GroupVersion.String(),
1820-
Kind: "Machine",
1821-
},
18221806
ObjectMeta: metav1.ObjectMeta{
18231807
Name: "deleting-machine",
18241808
Namespace: namespace.Name,
@@ -1851,10 +1835,6 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
18511835

18521836
// Existing machine that has a InfrastructureRef which does not exist.
18531837
nilInfraMachineMachine := &clusterv1.Machine{
1854-
TypeMeta: metav1.TypeMeta{
1855-
APIVersion: clusterv1.GroupVersion.String(),
1856-
Kind: "Machine",
1857-
},
18581838
ObjectMeta: metav1.ObjectMeta{
18591839
Name: "nil-infra-machine-machine",
18601840
Namespace: namespace.Name,
@@ -1880,10 +1860,6 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
18801860
}
18811861

18821862
kcp := &controlplanev1.KubeadmControlPlane{
1883-
TypeMeta: metav1.TypeMeta{
1884-
Kind: "KubeadmControlPlane",
1885-
APIVersion: controlplanev1.GroupVersion.String(),
1886-
},
18871863
ObjectMeta: metav1.ObjectMeta{
18881864
UID: types.UID("abc-123-control-plane"),
18891865
Name: "existing-kcp",
@@ -3982,10 +3958,6 @@ func createClusterWithControlPlane(namespace string) (*clusterv1.Cluster, *contr
39823958
}
39833959

39843960
kcp := &controlplanev1.KubeadmControlPlane{
3985-
TypeMeta: metav1.TypeMeta{
3986-
APIVersion: controlplanev1.GroupVersion.String(),
3987-
Kind: "KubeadmControlPlane",
3988-
},
39893961
ObjectMeta: metav1.ObjectMeta{
39903962
Name: kcpName,
39913963
Namespace: namespace,
@@ -4050,10 +4022,6 @@ func setKCPHealthy(kcp *controlplanev1.KubeadmControlPlane) {
40504022

40514023
func createMachineNodePair(name string, cluster *clusterv1.Cluster, kcp *controlplanev1.KubeadmControlPlane, ready bool) (*clusterv1.Machine, *corev1.Node) {
40524024
machine := &clusterv1.Machine{
4053-
TypeMeta: metav1.TypeMeta{
4054-
Kind: "Machine",
4055-
APIVersion: clusterv1.GroupVersion.String(),
4056-
},
40574025
ObjectMeta: metav1.ObjectMeta{
40584026
Namespace: cluster.Namespace,
40594027
Name: name,
@@ -4115,10 +4083,6 @@ func setMachineHealthy(m *clusterv1.Machine) {
41154083
// newCluster return a CAPI cluster object.
41164084
func newCluster(namespacedName *types.NamespacedName) *clusterv1.Cluster {
41174085
return &clusterv1.Cluster{
4118-
TypeMeta: metav1.TypeMeta{
4119-
Kind: "Cluster",
4120-
APIVersion: clusterv1.GroupVersion.String(),
4121-
},
41224086
ObjectMeta: metav1.ObjectMeta{
41234087
Namespace: namespacedName.Namespace,
41244088
Name: namespacedName.Name,

0 commit comments

Comments
 (0)