github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add podReplacementPolicy and terminating field to job api

Browse Source
This commit is contained in:
kannon92
2023-07-18 17:25:15 +00:00
parent dde22b3a5e
commit ce92952037
31 changed files with 715 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
pkg/apis/batch/validation/validation_test.go
View File

@@ -94,6 +94,8 @@ func TestValidateJob(t *testing.T) {
UID: types.UID("1a2b3c"),
}
validManualSelector := getValidManualSelector()
failedPodReplacement := batch.Failed
terminatingOrFailedPodReplacement := batch.TerminatingOrFailed
validPodTemplateSpecForManual := getValidPodTemplateSpecForManual(validManualSelector)
validGeneratedSelector := getValidGeneratedSelector()
validPodTemplateSpecForGenerated := getValidPodTemplateSpecForGenerated(validGeneratedSelector)
@@ -212,6 +214,36 @@ func TestValidateJob(t *testing.T) {
},
},
},
"valid pod replacement": {
opts: JobValidationOptions{RequirePrefixedLabels: true},
job: batch.Job{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
Selector: validGeneratedSelector,
Template: validPodTemplateSpecForGenerated,
PodReplacementPolicy: &terminatingOrFailedPodReplacement,
},
},
},
"valid pod replacement with failed": {
opts: JobValidationOptions{RequirePrefixedLabels: true},
job: batch.Job{
ObjectMeta: metav1.ObjectMeta{
Name: "myjob",
Namespace: metav1.NamespaceDefault,
UID: types.UID("1a2b3c"),
},
Spec: batch.JobSpec{
Selector: validGeneratedSelector,
Template: validPodTemplateSpecForGenerated,
PodReplacementPolicy: &failedPodReplacement,
},
},
},
"valid hostnet": {
opts: JobValidationOptions{RequirePrefixedLabels: true},
job: batch.Job{
@@ -749,6 +781,38 @@ func TestValidateJob(t *testing.T) {
},
opts: JobValidationOptions{RequirePrefixedLabels: true},
},
`spec.podReplacementPolicy: Unsupported value: "TerminatingOrFailed": supported values: "Failed"`: {
job: batch.Job{
ObjectMeta: validJobObjectMeta,
Spec: batch.JobSpec{
Selector: validGeneratedSelector,
PodReplacementPolicy: &terminatingOrFailedPodReplacement,
Template: validPodTemplateSpecForGeneratedRestartPolicyNever,
PodFailurePolicy: &batch.PodFailurePolicy{
Rules: []batch.PodFailurePolicyRule{{
Action: batch.PodFailurePolicyActionIgnore,
OnPodConditions: []batch.PodFailurePolicyOnPodConditionsPattern{{
Type: api.DisruptionTarget,
Status: api.ConditionTrue,
}},
},
},
},
},
},
opts: JobValidationOptions{RequirePrefixedLabels: true},
},
`spec.podReplacementPolicy: Unsupported value: "": supported values: "Failed", "TerminatingOrFailed"`: {
job: batch.Job{
ObjectMeta: validJobObjectMeta,
Spec: batch.JobSpec{
PodReplacementPolicy: (*batch.PodReplacementPolicy)(pointer.String("")),
Selector: validGeneratedSelector,
Template: validPodTemplateSpecForGeneratedRestartPolicyNever,
},
},
opts: JobValidationOptions{RequirePrefixedLabels: true},
},
`spec.template.spec.restartPolicy: Invalid value: "OnFailure": only "Never" is supported when podFailurePolicy is specified`: {
job: batch.Job{
ObjectMeta: validJobObjectMeta,
@@ -1962,9 +2026,10 @@ func TestValidateJobUpdateStatus(t *testing.T) {
ResourceVersion: "1",
},
Status: batch.JobStatus{
Active: 1,
Succeeded: 2,
Failed: 3,
Active: 1,
Succeeded: 2,
Failed: 3,
Terminating: pointer.Int32(4),
},
},
update: batch.Job{
@@ -1974,14 +2039,15 @@ func TestValidateJobUpdateStatus(t *testing.T) {
ResourceVersion: "1",
},
Status: batch.JobStatus{
Active: 2,
Succeeded: 3,
Failed: 4,
Ready: pointer.Int32(1),
Active: 2,
Succeeded: 3,
Failed: 4,
Ready: pointer.Int32(1),
Terminating: pointer.Int32(4),
},
},
},
"nil ready": {
"nil ready and terminating": {
old: batch.Job{
ObjectMeta: metav1.ObjectMeta{
Name: "abc",
@@ -2015,9 +2081,10 @@ func TestValidateJobUpdateStatus(t *testing.T) {
ResourceVersion: "10",
},
Status: batch.JobStatus{
Active: 1,
Succeeded: 2,
Failed: 3,
Active: 1,
Succeeded: 2,
Failed: 3,
Terminating: pointer.Int32(4),
},
},
update: batch.Job{
@@ -2027,10 +2094,11 @@ func TestValidateJobUpdateStatus(t *testing.T) {
ResourceVersion: "10",
},
Status: batch.JobStatus{
Active: -1,
Succeeded: -2,
Failed: -3,
Ready: pointer.Int32(-1),
Active: -1,
Succeeded: -2,
Failed: -3,
Ready: pointer.Int32(-1),
Terminating: pointer.Int32(-2),
},
},
wantErrs: field.ErrorList{
@@ -2038,6 +2106,7 @@ func TestValidateJobUpdateStatus(t *testing.T) {
{Type: field.ErrorTypeInvalid, Field: "status.succeeded"},
{Type: field.ErrorTypeInvalid, Field: "status.failed"},
{Type: field.ErrorTypeInvalid, Field: "status.ready"},
{Type: field.ErrorTypeInvalid, Field: "status.terminating"},
},
},
"empty and duplicated uncounted pods": {