Skip to content

Commit cd949ba

Browse files
fraenkelfraenkel
authored
use MakePodSpec consistently (kubernetes#125805)
cleaning up some tests after MakePod/MakePodSpec were introduced
1 parent 93d5651 commit cd949ba

File tree

18 files changed

+129
-130
lines changed

18 files changed

+129
-130
lines changed

‎pkg/api/pod/testing/make.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ func MakePod(name string, tweaks ...Tweak) *api.Pod {
5555
return pod
5656
}
5757

58-
func MakePodSpec(policy api.RestartPolicy, tweaks ...Tweak) api.PodSpec {
59-
return MakePod("", append([]Tweak{SetRestartPolicy(policy)}, tweaks...)...).Spec
58+
func MakePodSpec(tweaks ...Tweak) api.PodSpec {
59+
return MakePod("", tweaks...).Spec
6060
}
6161

6262
func SetNamespace(ns string) Tweak {

‎pkg/apis/apps/validation/validation_test.go‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,14 +1504,14 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
15041504
validSelector2 := map[string]string{"c": "d"}
15051505
invalidSelector := map[string]string{"NoUppercaseOrSpecialCharsLike=Equals": "b"}
15061506

1507-
validPodSpecAbc := podtest.MakePodSpec(api.RestartPolicyAlways,
1507+
validPodSpecAbc := podtest.MakePodSpec(
15081508
podtest.SetContainers(podtest.MakeContainer("abc")))
1509-
validPodSpecDef := podtest.MakePodSpec(api.RestartPolicyAlways,
1509+
validPodSpecDef := podtest.MakePodSpec(
15101510
podtest.SetContainers(podtest.MakeContainer("def")))
1511-
validPodSpecNodeSelector := podtest.MakePodSpec(api.RestartPolicyAlways,
1511+
validPodSpecNodeSelector := podtest.MakePodSpec(
15121512
podtest.SetNodeSelector(validSelector),
15131513
podtest.SetNodeName("xyz"))
1514-
validPodSpecVolume := podtest.MakePodSpec(api.RestartPolicyAlways,
1514+
validPodSpecVolume := podtest.MakePodSpec(
15151515
podtest.SetVolumes(api.Volume{Name: "gcepd", VolumeSource: api.VolumeSource{GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{PDName: "my-PD", FSType: "ext4", Partition: 1, ReadOnly: false}}}))
15161516

15171517
validPodTemplateAbc := api.PodTemplate{
@@ -1558,7 +1558,7 @@ func TestValidateDaemonSetUpdate(t *testing.T) {
15581558
invalidPodTemplate := api.PodTemplate{
15591559
Template: api.PodTemplateSpec{
15601560
// no containers specified
1561-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways, podtest.SetContainers()),
1561+
Spec: podtest.MakePodSpec(podtest.SetContainers()),
15621562
ObjectMeta: metav1.ObjectMeta{
15631563
Labels: validSelector,
15641564
},
@@ -1976,15 +1976,15 @@ func TestValidateDaemonSet(t *testing.T) {
19761976
ObjectMeta: metav1.ObjectMeta{
19771977
Labels: validSelector,
19781978
},
1979-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
1979+
Spec: podtest.MakePodSpec(),
19801980
},
19811981
}
19821982
validHostNetPodTemplate := api.PodTemplate{
19831983
Template: api.PodTemplateSpec{
19841984
ObjectMeta: metav1.ObjectMeta{
19851985
Labels: validSelector,
19861986
},
1987-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways,
1987+
Spec: podtest.MakePodSpec(
19881988
podtest.SetSecurityContext(&api.PodSecurityContext{
19891989
HostNetwork: true,
19901990
}),
@@ -1999,7 +1999,7 @@ func TestValidateDaemonSet(t *testing.T) {
19991999
invalidSelector := map[string]string{"NoUppercaseOrSpecialCharsLike=Equals": "b"}
20002000
invalidPodTemplate := api.PodTemplate{
20012001
Template: api.PodTemplateSpec{
2002-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways, podtest.SetLabels(invalidSelector)),
2002+
Spec: podtest.MakePodSpec(podtest.SetLabels(invalidSelector)),
20032003
},
20042004
}
20052005
successCases := []apps.DaemonSet{{
@@ -2124,7 +2124,7 @@ func TestValidateDaemonSet(t *testing.T) {
21242124
Spec: apps.DaemonSetSpec{
21252125
Selector: &metav1.LabelSelector{MatchLabels: validSelector},
21262126
Template: api.PodTemplateSpec{
2127-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure, podtest.SetLabels(validSelector)),
2127+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure), podtest.SetLabels(validSelector)),
21282128
},
21292129
},
21302130
},
@@ -2136,7 +2136,7 @@ func TestValidateDaemonSet(t *testing.T) {
21362136
Spec: apps.DaemonSetSpec{
21372137
Selector: &metav1.LabelSelector{MatchLabels: validSelector},
21382138
Template: api.PodTemplateSpec{
2139-
Spec: podtest.MakePodSpec(api.RestartPolicyNever, podtest.SetLabels(validSelector)),
2139+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyNever), podtest.SetLabels(validSelector)),
21402140
},
21412141
},
21422142
},
@@ -2148,7 +2148,7 @@ func TestValidateDaemonSet(t *testing.T) {
21482148
ObjectMeta: metav1.ObjectMeta{
21492149
Labels: validSelector,
21502150
},
2151-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways,
2151+
Spec: podtest.MakePodSpec(
21522152
podtest.SetEphemeralContainers(api.EphemeralContainer{EphemeralContainerCommon: api.EphemeralContainerCommon{Name: "debug", Image: "image", ImagePullPolicy: "IfNotPresent", TerminationMessagePolicy: "File"}})),
21532153
},
21542154
UpdateStrategy: apps.DaemonSetUpdateStrategy{
@@ -2207,7 +2207,7 @@ func validDeployment(tweaks ...func(d *apps.Deployment)) *apps.Deployment {
22072207
"name": "abc",
22082208
},
22092209
},
2210-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
2210+
Spec: podtest.MakePodSpec(),
22112211
},
22122212
RollbackTo: &apps.RollbackConfig{
22132213
Revision: 1,
@@ -2538,15 +2538,15 @@ func TestValidateDeploymentUpdate(t *testing.T) {
25382538
ObjectMeta: metav1.ObjectMeta{
25392539
Labels: validLabels,
25402540
},
2541-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
2541+
Spec: podtest.MakePodSpec(),
25422542
},
25432543
}
25442544
readWriteVolumePodTemplate := api.PodTemplate{
25452545
Template: api.PodTemplateSpec{
25462546
ObjectMeta: metav1.ObjectMeta{
25472547
Labels: validLabels,
25482548
},
2549-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways,
2549+
Spec: podtest.MakePodSpec(
25502550
podtest.SetVolumes(api.Volume{Name: "gcepd", VolumeSource: api.VolumeSource{GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{PDName: "my-PD", FSType: "ext4", Partition: 1, ReadOnly: false}}}),
25512551
),
25522552
},
@@ -2555,7 +2555,7 @@ func TestValidateDeploymentUpdate(t *testing.T) {
25552555
invalidPodTemplate := api.PodTemplate{
25562556
Template: api.PodTemplateSpec{
25572557
// no containers specified
2558-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways, podtest.SetContainers()),
2558+
Spec: podtest.MakePodSpec(podtest.SetContainers()),
25592559
ObjectMeta: metav1.ObjectMeta{
25602560
Labels: invalidLabels,
25612561
},
@@ -2852,7 +2852,7 @@ func TestValidateReplicaSetStatusUpdate(t *testing.T) {
28522852
ObjectMeta: metav1.ObjectMeta{
28532853
Labels: validLabels,
28542854
},
2855-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
2855+
Spec: podtest.MakePodSpec(),
28562856
},
28572857
}
28582858
type rcUpdateTest struct {
@@ -2930,23 +2930,23 @@ func TestValidateReplicaSetUpdate(t *testing.T) {
29302930
ObjectMeta: metav1.ObjectMeta{
29312931
Labels: validLabels,
29322932
},
2933-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
2933+
Spec: podtest.MakePodSpec(),
29342934
},
29352935
}
29362936
readWriteVolumePodTemplate := api.PodTemplate{
29372937
Template: api.PodTemplateSpec{
29382938
ObjectMeta: metav1.ObjectMeta{
29392939
Labels: validLabels,
29402940
},
2941-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways,
2941+
Spec: podtest.MakePodSpec(
29422942
podtest.SetVolumes(api.Volume{Name: "gcepd", VolumeSource: api.VolumeSource{GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{PDName: "my-PD", FSType: "ext4", Partition: 1, ReadOnly: false}}}),
29432943
),
29442944
},
29452945
}
29462946
invalidLabels := map[string]string{"NoUppercaseOrSpecialCharsLike=Equals": "b"}
29472947
invalidPodTemplate := api.PodTemplate{
29482948
Template: api.PodTemplateSpec{
2949-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways, podtest.SetContainers()),
2949+
Spec: podtest.MakePodSpec(podtest.SetContainers()),
29502950
ObjectMeta: metav1.ObjectMeta{
29512951
Labels: invalidLabels,
29522952
},
@@ -3096,15 +3096,15 @@ func TestValidateReplicaSet(t *testing.T) {
30963096
ObjectMeta: metav1.ObjectMeta{
30973097
Labels: validLabels,
30983098
},
3099-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
3099+
Spec: podtest.MakePodSpec(),
31003100
},
31013101
}
31023102
validHostNetPodTemplate := api.PodTemplate{
31033103
Template: api.PodTemplateSpec{
31043104
ObjectMeta: metav1.ObjectMeta{
31053105
Labels: validLabels,
31063106
},
3107-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways,
3107+
Spec: podtest.MakePodSpec(
31083108
podtest.SetSecurityContext(&api.PodSecurityContext{
31093109
HostNetwork: true,
31103110
}),
@@ -3120,15 +3120,15 @@ func TestValidateReplicaSet(t *testing.T) {
31203120
ObjectMeta: metav1.ObjectMeta{
31213121
Labels: validLabels,
31223122
},
3123-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways,
3123+
Spec: podtest.MakePodSpec(
31243124
podtest.SetVolumes(api.Volume{Name: "gcepd", VolumeSource: api.VolumeSource{GCEPersistentDisk: &api.GCEPersistentDiskVolumeSource{PDName: "my-PD", FSType: "ext4", Partition: 1, ReadOnly: false}}}),
31253125
),
31263126
},
31273127
}
31283128
invalidLabels := map[string]string{"NoUppercaseOrSpecialCharsLike=Equals": "b"}
31293129
invalidPodTemplate := api.PodTemplate{
31303130
Template: api.PodTemplateSpec{
3131-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
3131+
Spec: podtest.MakePodSpec(),
31323132
ObjectMeta: metav1.ObjectMeta{
31333133
Labels: invalidLabels,
31343134
},
@@ -3262,7 +3262,7 @@ func TestValidateReplicaSet(t *testing.T) {
32623262
Spec: apps.ReplicaSetSpec{
32633263
Selector: &metav1.LabelSelector{MatchLabels: validLabels},
32643264
Template: api.PodTemplateSpec{
3265-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
3265+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
32663266
ObjectMeta: metav1.ObjectMeta{
32673267
Labels: validLabels,
32683268
},
@@ -3277,7 +3277,7 @@ func TestValidateReplicaSet(t *testing.T) {
32773277
Spec: apps.ReplicaSetSpec{
32783278
Selector: &metav1.LabelSelector{MatchLabels: validLabels},
32793279
Template: api.PodTemplateSpec{
3280-
Spec: podtest.MakePodSpec(api.RestartPolicyNever),
3280+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyNever)),
32813281
ObjectMeta: metav1.ObjectMeta{
32823282
Labels: validLabels,
32833283
},

‎pkg/apis/batch/validation/validation_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func getValidPodTemplateSpecForManual(selector *metav1.LabelSelector) api.PodTem
6262
ObjectMeta: metav1.ObjectMeta{
6363
Labels: selector.MatchLabels,
6464
},
65-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
65+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
6666
}
6767
}
6868

@@ -77,7 +77,7 @@ func getValidPodTemplateSpecForGenerated(selector *metav1.LabelSelector) api.Pod
7777
ObjectMeta: metav1.ObjectMeta{
7878
Labels: selector.MatchLabels,
7979
},
80-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure,
80+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure),
8181
podtest.SetInitContainers(podtest.MakeContainer("def"))),
8282
}
8383
}
@@ -388,7 +388,7 @@ func TestValidateJob(t *testing.T) {
388388
ObjectMeta: metav1.ObjectMeta{
389389
Labels: map[string]string{batch.LegacyControllerUidLabel: "1a2b3c", batch.LegacyJobNameLabel: "myjob"},
390390
},
391-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
391+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
392392
},
393393
},
394394
},
@@ -1021,7 +1021,7 @@ func TestValidateJob(t *testing.T) {
10211021
ObjectMeta: metav1.ObjectMeta{
10221022
Labels: validGeneratedSelector.MatchLabels,
10231023
},
1024-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
1024+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
10251025
},
10261026
PodFailurePolicy: &batch.PodFailurePolicy{
10271027
Rules: []batch.PodFailurePolicyRule{},
@@ -1235,7 +1235,7 @@ func TestValidateJob(t *testing.T) {
12351235
ObjectMeta: metav1.ObjectMeta{
12361236
Labels: map[string]string{"y": "z"},
12371237
},
1238-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
1238+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
12391239
},
12401240
},
12411241
},
@@ -1255,7 +1255,7 @@ func TestValidateJob(t *testing.T) {
12551255
ObjectMeta: metav1.ObjectMeta{
12561256
Labels: map[string]string{"controller-uid": "4d5e6f"},
12571257
},
1258-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
1258+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
12591259
},
12601260
},
12611261
},
@@ -1275,7 +1275,7 @@ func TestValidateJob(t *testing.T) {
12751275
ObjectMeta: metav1.ObjectMeta{
12761276
Labels: validManualSelector.MatchLabels,
12771277
},
1278-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
1278+
Spec: podtest.MakePodSpec(),
12791279
},
12801280
},
12811281
},
@@ -1295,7 +1295,7 @@ func TestValidateJob(t *testing.T) {
12951295
ObjectMeta: metav1.ObjectMeta{
12961296
Labels: validManualSelector.MatchLabels,
12971297
},
1298-
Spec: podtest.MakePodSpec("Invalid"),
1298+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy("Invalid")),
12991299
},
13001300
},
13011301
},
@@ -1363,7 +1363,7 @@ func TestValidateJob(t *testing.T) {
13631363
ObjectMeta: metav1.ObjectMeta{
13641364
Labels: map[string]string{batch.LegacyJobNameLabel: "myjob"},
13651365
},
1366-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
1366+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
13671367
},
13681368
},
13691369
},
@@ -1383,7 +1383,7 @@ func TestValidateJob(t *testing.T) {
13831383
ObjectMeta: metav1.ObjectMeta{
13841384
Labels: map[string]string{batch.LegacyJobNameLabel: "myjob"},
13851385
},
1386-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
1386+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
13871387
},
13881388
},
13891389
},
@@ -1420,7 +1420,7 @@ func TestValidateJob(t *testing.T) {
14201420
ObjectMeta: metav1.ObjectMeta{
14211421
Labels: map[string]string{batch.JobNameLabel: "myjob", batch.LegacyControllerUidLabel: "1a2b3c", batch.LegacyJobNameLabel: "myjob"},
14221422
},
1423-
Spec: podtest.MakePodSpec(api.RestartPolicyOnFailure),
1423+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy(api.RestartPolicyOnFailure)),
14241424
},
14251425
},
14261426
},
@@ -2835,7 +2835,7 @@ func TestValidateCronJob(t *testing.T) {
28352835
JobTemplate: batch.JobTemplateSpec{
28362836
Spec: batch.JobSpec{
28372837
Template: api.PodTemplateSpec{
2838-
Spec: podtest.MakePodSpec(api.RestartPolicyAlways),
2838+
Spec: podtest.MakePodSpec(),
28392839
},
28402840
},
28412841
},
@@ -2853,7 +2853,7 @@ func TestValidateCronJob(t *testing.T) {
28532853
JobTemplate: batch.JobTemplateSpec{
28542854
Spec: batch.JobSpec{
28552855
Template: api.PodTemplateSpec{
2856-
Spec: podtest.MakePodSpec("Invalid"),
2856+
Spec: podtest.MakePodSpec(podtest.SetRestartPolicy("Invalid")),
28572857
},
28582858
},
28592859
},

‎pkg/apis/core/validation/validation.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3142,6 +3142,9 @@ func handlerFromLifecycle(lh *core.LifecycleHandler) commonHandler {
31423142

31433143
func validateSleepAction(sleep *core.SleepAction, gracePeriod *int64, fldPath *field.Path) field.ErrorList {
31443144
allErrors := field.ErrorList{}
3145+
// We allow gracePeriod to be nil here because the pod in which this SleepAction
3146+
// is defined might have an invalid grace period defined, and we don't want to
3147+
// flag another error here when the real problem will already be flagged.
31453148
if gracePeriod != nil && sleep.Seconds <= 0 || sleep.Seconds > *gracePeriod {
31463149
invalidStr := fmt.Sprintf("must be greater than 0 and less than terminationGracePeriodSeconds (%d)", *gracePeriod)
31473150
allErrors = append(allErrors, field.Invalid(fldPath, sleep.Seconds, invalidStr))

0 commit comments

Comments
 (0)