Skip to content

Commit 530e7a3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8778 from Dhairya-Arora01/webhookUnit
🌱 Validating the warnings in tests
2 parents 0ba7f45 + a75ff05 commit 530e7a3

18 files changed

+212
-102
lines changed

‎api/v1beta1/machine_webhook_test.go

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,19 @@ func TestMachineBootstrapValidation(t *testing.T) {
7979
Spec: MachineSpec{Bootstrap: tt.bootstrap},
8080
}
8181
if tt.expectErr {
82-
_, err := m.ValidateCreate()
82+
warnings, err := m.ValidateCreate()
8383
g.Expect(err).To(HaveOccurred())
84-
_, err = m.ValidateUpdate(m)
84+
g.Expect(warnings).To(BeEmpty())
85+
warnings, err = m.ValidateUpdate(m)
8586
g.Expect(err).To(HaveOccurred())
87+
g.Expect(warnings).To(BeEmpty())
8688
} else {
87-
_, err := m.ValidateCreate()
89+
warnings, err := m.ValidateCreate()
8890
g.Expect(err).ToNot(HaveOccurred())
89-
_, err = m.ValidateUpdate(m)
91+
g.Expect(warnings).To(BeEmpty())
92+
warnings, err = m.ValidateUpdate(m)
9093
g.Expect(err).ToNot(HaveOccurred())
94+
g.Expect(warnings).To(BeEmpty())
9195
}
9296
})
9397
}
@@ -141,15 +145,19 @@ func TestMachineNamespaceValidation(t *testing.T) {
141145
}
142146

143147
if tt.expectErr {
144-
_, err := m.ValidateCreate()
148+
warnings, err := m.ValidateCreate()
145149
g.Expect(err).To(HaveOccurred())
146-
_, err = m.ValidateUpdate(m)
150+
g.Expect(warnings).To(BeEmpty())
151+
warnings, err = m.ValidateUpdate(m)
147152
g.Expect(err).To(HaveOccurred())
153+
g.Expect(warnings).To(BeEmpty())
148154
} else {
149-
_, err := m.ValidateCreate()
155+
warnings, err := m.ValidateCreate()
150156
g.Expect(err).ToNot(HaveOccurred())
151-
_, err = m.ValidateUpdate(m)
157+
g.Expect(warnings).To(BeEmpty())
158+
warnings, err = m.ValidateUpdate(m)
152159
g.Expect(err).ToNot(HaveOccurred())
160+
g.Expect(warnings).To(BeEmpty())
153161
}
154162
})
155163
}
@@ -193,11 +201,13 @@ func TestMachineClusterNameImmutable(t *testing.T) {
193201
},
194202
}
195203

196-
_, err := newMachine.ValidateUpdate(oldMachine)
204+
warnings, err := newMachine.ValidateUpdate(oldMachine)
197205
if tt.expectErr {
198206
g.Expect(err).To(HaveOccurred())
207+
g.Expect(warnings).To(BeEmpty())
199208
} else {
200209
g.Expect(err).NotTo(HaveOccurred())
210+
g.Expect(warnings).To(BeEmpty())
201211
}
202212
})
203213
}
@@ -248,15 +258,19 @@ func TestMachineVersionValidation(t *testing.T) {
248258
}
249259

250260
if tt.expectErr {
251-
_, err := m.ValidateCreate()
261+
warnings, err := m.ValidateCreate()
252262
g.Expect(err).To(HaveOccurred())
253-
_, err = m.ValidateUpdate(m)
263+
g.Expect(warnings).To(BeEmpty())
264+
warnings, err = m.ValidateUpdate(m)
254265
g.Expect(err).To(HaveOccurred())
266+
g.Expect(warnings).To(BeEmpty())
255267
} else {
256-
_, err := m.ValidateCreate()
268+
warnings, err := m.ValidateCreate()
257269
g.Expect(err).ToNot(HaveOccurred())
258-
_, err = m.ValidateUpdate(m)
270+
g.Expect(warnings).To(BeEmpty())
271+
warnings, err = m.ValidateUpdate(m)
259272
g.Expect(err).ToNot(HaveOccurred())
273+
g.Expect(warnings).To(BeEmpty())
260274
}
261275
})
262276
}

‎api/v1beta1/machinedeployment_webhook_test.go

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -393,15 +393,19 @@ func TestMachineDeploymentValidation(t *testing.T) {
393393
},
394394
}
395395
if tt.expectErr {
396-
_, err := md.ValidateCreate()
396+
warnings, err := md.ValidateCreate()
397397
g.Expect(err).To(HaveOccurred())
398-
_, err = md.ValidateUpdate(md)
398+
g.Expect(warnings).To(BeEmpty())
399+
warnings, err = md.ValidateUpdate(md)
399400
g.Expect(err).To(HaveOccurred())
401+
g.Expect(warnings).To(BeEmpty())
400402
} else {
401-
_, err := md.ValidateCreate()
403+
warnings, err := md.ValidateCreate()
402404
g.Expect(err).NotTo(HaveOccurred())
403-
_, err = md.ValidateUpdate(md)
405+
g.Expect(warnings).To(BeEmpty())
406+
warnings, err = md.ValidateUpdate(md)
404407
g.Expect(err).NotTo(HaveOccurred())
408+
g.Expect(warnings).To(BeEmpty())
405409
}
406410
})
407411
}
@@ -456,15 +460,19 @@ func TestMachineDeploymentVersionValidation(t *testing.T) {
456460
}
457461

458462
if tt.expectErr {
459-
_, err := md.ValidateCreate()
463+
warnings, err := md.ValidateCreate()
460464
g.Expect(err).To(HaveOccurred())
461-
_, err = md.ValidateUpdate(md)
465+
g.Expect(warnings).To(BeEmpty())
466+
warnings, err = md.ValidateUpdate(md)
462467
g.Expect(err).To(HaveOccurred())
468+
g.Expect(warnings).To(BeEmpty())
463469
} else {
464-
_, err := md.ValidateCreate()
470+
warnings, err := md.ValidateCreate()
465471
g.Expect(err).ToNot(HaveOccurred())
466-
_, err = md.ValidateUpdate(md)
472+
g.Expect(warnings).To(BeEmpty())
473+
warnings, err = md.ValidateUpdate(md)
467474
g.Expect(err).ToNot(HaveOccurred())
475+
g.Expect(warnings).To(BeEmpty())
468476
}
469477
})
470478
}
@@ -507,12 +515,13 @@ func TestMachineDeploymentClusterNameImmutable(t *testing.T) {
507515
},
508516
}
509517

510-
_, err := newMD.ValidateUpdate(oldMD)
518+
warnings, err := newMD.ValidateUpdate(oldMD)
511519
if tt.expectErr {
512520
g.Expect(err).To(HaveOccurred())
513521
} else {
514522
g.Expect(err).NotTo(HaveOccurred())
515523
}
524+
g.Expect(warnings).To(BeEmpty())
516525
})
517526
}
518527
}
@@ -539,21 +548,24 @@ func defaultValidateTestCustomDefaulter(object admission.Validator, customDefaul
539548
t.Run("validate-on-create", func(t *testing.T) {
540549
g := NewWithT(t)
541550
g.Expect(customDefaulter.Default(ctx, createCopy)).To(Succeed())
542-
_, err := createCopy.ValidateCreate()
551+
warnings, err := createCopy.ValidateCreate()
543552
g.Expect(err).NotTo(HaveOccurred())
553+
g.Expect(warnings).To(BeEmpty())
544554
})
545555
t.Run("validate-on-update", func(t *testing.T) {
546556
g := NewWithT(t)
547557
g.Expect(customDefaulter.Default(ctx, defaultingUpdateCopy)).To(Succeed())
548558
g.Expect(customDefaulter.Default(ctx, updateCopy)).To(Succeed())
549-
_, err := defaultingUpdateCopy.ValidateUpdate(updateCopy)
559+
warnings, err := defaultingUpdateCopy.ValidateUpdate(updateCopy)
550560
g.Expect(err).NotTo(HaveOccurred())
561+
g.Expect(warnings).To(BeEmpty())
551562
})
552563
t.Run("validate-on-delete", func(t *testing.T) {
553564
g := NewWithT(t)
554565
g.Expect(customDefaulter.Default(ctx, deleteCopy)).To(Succeed())
555-
_, err := deleteCopy.ValidateDelete()
566+
warnings, err := deleteCopy.ValidateDelete()
556567
g.Expect(err).NotTo(HaveOccurred())
568+
g.Expect(warnings).To(BeEmpty())
557569
})
558570
}
559571
}

‎api/v1beta1/machinehealthcheck_webhook_test.go

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,19 @@ func TestMachineHealthCheckLabelSelectorAsSelectorValidation(t *testing.T) {
9292
},
9393
}
9494
if tt.expectErr {
95-
_, err := mhc.ValidateCreate()
95+
warnings, err := mhc.ValidateCreate()
9696
g.Expect(err).To(HaveOccurred())
97-
_, err = mhc.ValidateUpdate(mhc)
97+
g.Expect(warnings).To(BeEmpty())
98+
warnings, err = mhc.ValidateUpdate(mhc)
9899
g.Expect(err).To(HaveOccurred())
100+
g.Expect(warnings).To(BeEmpty())
99101
} else {
100-
_, err := mhc.ValidateCreate()
102+
warnings, err := mhc.ValidateCreate()
101103
g.Expect(err).NotTo(HaveOccurred())
102-
_, err = mhc.ValidateUpdate(mhc)
104+
g.Expect(warnings).To(BeEmpty())
105+
warnings, err = mhc.ValidateUpdate(mhc)
103106
g.Expect(err).NotTo(HaveOccurred())
107+
g.Expect(warnings).To(BeEmpty())
104108
}
105109
})
106110
}
@@ -164,12 +168,13 @@ func TestMachineHealthCheckClusterNameImmutable(t *testing.T) {
164168
},
165169
}
166170

167-
_, err := newMHC.ValidateUpdate(oldMHC)
171+
warnings, err := newMHC.ValidateUpdate(oldMHC)
168172
if tt.expectErr {
169173
g.Expect(err).To(HaveOccurred())
170174
} else {
171175
g.Expect(err).NotTo(HaveOccurred())
172176
}
177+
g.Expect(warnings).To(BeEmpty())
173178
})
174179
}
175180
}
@@ -216,15 +221,19 @@ func TestMachineHealthCheckUnhealthyConditions(t *testing.T) {
216221
},
217222
}
218223
if tt.expectErr {
219-
_, err := mhc.ValidateCreate()
224+
warnings, err := mhc.ValidateCreate()
220225
g.Expect(err).To(HaveOccurred())
221-
_, err = mhc.ValidateUpdate(mhc)
226+
g.Expect(warnings).To(BeEmpty())
227+
warnings, err = mhc.ValidateUpdate(mhc)
222228
g.Expect(err).To(HaveOccurred())
229+
g.Expect(warnings).To(BeEmpty())
223230
} else {
224-
_, err := mhc.ValidateCreate()
231+
warnings, err := mhc.ValidateCreate()
225232
g.Expect(err).NotTo(HaveOccurred())
226-
_, err = mhc.ValidateUpdate(mhc)
233+
g.Expect(warnings).To(BeEmpty())
234+
warnings, err = mhc.ValidateUpdate(mhc)
227235
g.Expect(err).NotTo(HaveOccurred())
236+
g.Expect(warnings).To(BeEmpty())
228237
}
229238
})
230239
}
@@ -295,15 +304,19 @@ func TestMachineHealthCheckNodeStartupTimeout(t *testing.T) {
295304
}
296305

297306
if tt.expectErr {
298-
_, err := mhc.ValidateCreate()
307+
warnings, err := mhc.ValidateCreate()
299308
g.Expect(err).To(HaveOccurred())
300-
_, err = mhc.ValidateUpdate(mhc)
309+
g.Expect(warnings).To(BeEmpty())
310+
warnings, err = mhc.ValidateUpdate(mhc)
301311
g.Expect(err).To(HaveOccurred())
312+
g.Expect(warnings).To(BeEmpty())
302313
} else {
303-
_, err := mhc.ValidateCreate()
314+
warnings, err := mhc.ValidateCreate()
304315
g.Expect(err).NotTo(HaveOccurred())
305-
_, err = mhc.ValidateUpdate(mhc)
316+
g.Expect(warnings).To(BeEmpty())
317+
warnings, err = mhc.ValidateUpdate(mhc)
306318
g.Expect(err).NotTo(HaveOccurred())
319+
g.Expect(warnings).To(BeEmpty())
307320
}
308321
}
309322
}
@@ -358,15 +371,19 @@ func TestMachineHealthCheckMaxUnhealthy(t *testing.T) {
358371
}
359372

360373
if tt.expectErr {
361-
_, err := mhc.ValidateCreate()
374+
warnings, err := mhc.ValidateCreate()
362375
g.Expect(err).To(HaveOccurred())
363-
_, err = mhc.ValidateUpdate(mhc)
376+
g.Expect(warnings).To(BeEmpty())
377+
warnings, err = mhc.ValidateUpdate(mhc)
364378
g.Expect(err).To(HaveOccurred())
379+
g.Expect(warnings).To(BeEmpty())
365380
} else {
366-
_, err := mhc.ValidateCreate()
381+
warnings, err := mhc.ValidateCreate()
367382
g.Expect(err).NotTo(HaveOccurred())
368-
_, err = mhc.ValidateUpdate(mhc)
383+
g.Expect(warnings).To(BeEmpty())
384+
warnings, err = mhc.ValidateUpdate(mhc)
369385
g.Expect(err).NotTo(HaveOccurred())
386+
g.Expect(warnings).To(BeEmpty())
370387
}
371388
}
372389
}

‎api/v1beta1/machineset_webhook_test.go

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,19 @@ func TestMachineSetLabelSelectorMatchValidation(t *testing.T) {
106106
}
107107

108108
if tt.expectErr {
109-
_, err := ms.ValidateCreate()
109+
warnings, err := ms.ValidateCreate()
110110
g.Expect(err).To(HaveOccurred())
111-
_, err = ms.ValidateUpdate(ms)
111+
g.Expect(warnings).To(BeEmpty())
112+
warnings, err = ms.ValidateUpdate(ms)
112113
g.Expect(err).To(HaveOccurred())
114+
g.Expect(warnings).To(BeEmpty())
113115
} else {
114-
_, err := ms.ValidateCreate()
116+
warnings, err := ms.ValidateCreate()
115117
g.Expect(err).NotTo(HaveOccurred())
116-
_, err = ms.ValidateUpdate(ms)
118+
g.Expect(warnings).To(BeEmpty())
119+
warnings, err = ms.ValidateUpdate(ms)
117120
g.Expect(err).NotTo(HaveOccurred())
121+
g.Expect(warnings).To(BeEmpty())
118122
}
119123
})
120124
}
@@ -157,12 +161,13 @@ func TestMachineSetClusterNameImmutable(t *testing.T) {
157161
},
158162
}
159163

160-
_, err := newMS.ValidateUpdate(oldMS)
164+
warnings, err := newMS.ValidateUpdate(oldMS)
161165
if tt.expectErr {
162166
g.Expect(err).To(HaveOccurred())
163167
} else {
164168
g.Expect(err).NotTo(HaveOccurred())
165169
}
170+
g.Expect(warnings).To(BeEmpty())
166171
})
167172
}
168173
}
@@ -215,15 +220,19 @@ func TestMachineSetVersionValidation(t *testing.T) {
215220
}
216221

217222
if tt.expectErr {
218-
_, err := md.ValidateCreate()
223+
warnings, err := md.ValidateCreate()
219224
g.Expect(err).To(HaveOccurred())
220-
_, err = md.ValidateUpdate(md)
225+
g.Expect(warnings).To(BeEmpty())
226+
warnings, err = md.ValidateUpdate(md)
221227
g.Expect(err).To(HaveOccurred())
228+
g.Expect(warnings).To(BeEmpty())
222229
} else {
223-
_, err := md.ValidateCreate()
230+
warnings, err := md.ValidateCreate()
224231
g.Expect(err).NotTo(HaveOccurred())
225-
_, err = md.ValidateUpdate(md)
232+
g.Expect(warnings).To(BeEmpty())
233+
warnings, err = md.ValidateUpdate(md)
226234
g.Expect(err).NotTo(HaveOccurred())
235+
g.Expect(warnings).To(BeEmpty())
227236
}
228237
})
229238
}

‎bootstrap/kubeadm/api/v1beta1/kubeadmconfig_webhook_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,15 +464,19 @@ func TestKubeadmConfigValidate(t *testing.T) {
464464
g := NewWithT(t)
465465

466466
if tt.expectErr {
467-
_, err := tt.in.ValidateCreate()
467+
warnings, err := tt.in.ValidateCreate()
468468
g.Expect(err).To(HaveOccurred())
469-
_, err = tt.in.ValidateUpdate(nil)
469+
g.Expect(warnings).To(BeEmpty())
470+
warnings, err = tt.in.ValidateUpdate(nil)
470471
g.Expect(err).To(HaveOccurred())
472+
g.Expect(warnings).To(BeEmpty())
471473
} else {
472-
_, err := tt.in.ValidateCreate()
474+
warnings, err := tt.in.ValidateCreate()
473475
g.Expect(err).NotTo(HaveOccurred())
474-
_, err = tt.in.ValidateUpdate(nil)
476+
g.Expect(warnings).To(BeEmpty())
477+
warnings, err = tt.in.ValidateUpdate(nil)
475478
g.Expect(err).NotTo(HaveOccurred())
479+
g.Expect(warnings).To(BeEmpty())
476480
}
477481
})
478482
}

‎bootstrap/kubeadm/api/v1beta1/kubeadmconfigtemplate_webhook_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ func TestKubeadmConfigTemplateValidation(t *testing.T) {
6868

6969
t.Run(name, func(t *testing.T) {
7070
g := NewWithT(t)
71-
_, err := tt.in.ValidateCreate()
71+
warnings, err := tt.in.ValidateCreate()
7272
g.Expect(err).NotTo(HaveOccurred())
73-
_, err = tt.in.ValidateUpdate(nil)
73+
g.Expect(warnings).To(BeEmpty())
74+
warnings, err = tt.in.ValidateUpdate(nil)
7475
g.Expect(err).NotTo(HaveOccurred())
76+
g.Expect(warnings).To(BeEmpty())
7577
})
7678
}
7779
}

0 commit comments

Comments
 (0)