Merge pull request #100188 from alculquicondor/job-api-fixes

Only default Job fields when feature gates are enabled Kubernetes-commit: b345913c5eb794ded1a577db66e9f566eb8e5957
kubernetes · Mar 15, 2021 · fd88418 · fd88418
2 parents 51a1c55 + 862c319
commit fd88418
Show file tree

Hide file tree

Showing 21 changed files with 143 additions and 129 deletions.
diff --git a/batch/v1/generated.pb.go b/batch/v1/generated.pb.go
diff --git a/batch/v1/types.go b/batch/v1/types.go
@@ -168,7 +168,7 @@ type JobSpec struct {
 	// If the Job controller observes a mode that it doesn't recognize, the
 	// controller skips updates for the Job.
 	// +optional
-	CompletionMode CompletionMode `json:"completionMode,omitempty" protobuf:"bytes,9,opt,name=completionMode,casttype=CompletionMode"`
+	CompletionMode *CompletionMode `json:"completionMode,omitempty" protobuf:"bytes,9,opt,name=completionMode,casttype=CompletionMode"`
 
 	// Suspend specifies whether the Job controller should create Pods or not. If
 	// a Job is created with suspend set to true, no Pods are created by the Job

diff --git a/batch/v1/zz_generated.deepcopy.go b/batch/v1/zz_generated.deepcopy.go
diff --git a/testdata/HEAD/batch.v1.CronJob.json b/testdata/HEAD/batch.v1.CronJob.json
@@ -1577,19 +1577,20 @@
           }
         },
         "ttlSecondsAfterFinished": -1285029915,
-        "suspend": true
+        "completionMode": "{ȃ騑ȫ(踶ǊđƟÝɹ橽ƴåj}c殶",
+        "suspend": false
       }
     },
-    "successfulJobsHistoryLimit": 1729066291,
-    "failedJobsHistoryLimit": -908823020
+    "successfulJobsHistoryLimit": -2006986560,
+    "failedJobsHistoryLimit": -380889943
   },
   "status": {
     "active": [
       {
         "kind": "505",
         "namespace": "506",
         "name": "507",
-        "uid": "`",
+        "uid": "暉Ŝ!ȣ绰",
         "apiVersion": "508",
         "resourceVersion": "509",
         "fieldPath": "510"

diff --git a/testdata/HEAD/batch.v1.CronJob.pb b/testdata/HEAD/batch.v1.CronJob.pb
diff --git a/testdata/HEAD/batch.v1.CronJob.yaml b/testdata/HEAD/batch.v1.CronJob.yaml
@@ -31,7 +31,7 @@ metadata:
   uid: "7"
 spec:
   concurrencyPolicy: Hr鯹)晿<o,c鮽ort昍řČ扷5Ɨ
-  failedJobsHistoryLimit: -908823020
+  failedJobsHistoryLimit: -380889943
   jobTemplate:
     metadata:
       annotations:
@@ -65,6 +65,7 @@ spec:
     spec:
       activeDeadlineSeconds: -1483125035702892746
       backoffLimit: -1822122846
+      completionMode: '{ȃ騑ȫ(踶ǊđƟÝɹ橽ƴåj}c殶'
       completions: -106888179
       manualSelector: true
       parallelism: -856030588
@@ -74,7 +75,7 @@ spec:
           operator: DoesNotExist
         matchLabels:
           2_kS91.e5K-_e63_-_3-n-_-__3u-.__P__.7U-Uo_4_-D7r__.am6-4_WE-_T: cd-2.-__E_Sv__26KX_R_.-.Nth._--S_4DAm
-      suspend: true
+      suspend: false
       template:
         metadata:
           annotations:
@@ -1081,7 +1082,7 @@ spec:
       ttlSecondsAfterFinished: -1285029915
   schedule: "19"
   startingDeadlineSeconds: -2555947251840004808
-  successfulJobsHistoryLimit: 1729066291
+  successfulJobsHistoryLimit: -2006986560
   suspend: true
 status:
   active:
@@ -1091,4 +1092,4 @@ status:
     name: "507"
     namespace: "506"
     resourceVersion: "509"
-    uid: '`'
+    uid: 暉Ŝ!ȣ绰
diff --git a/testdata/HEAD/batch.v1.Job.json b/testdata/HEAD/batch.v1.Job.json
@@ -1530,23 +1530,23 @@
       }
     },
     "ttlSecondsAfterFinished": 1020403419,
-    "completionMode": "ʉiUȡɭĮ庺%#囨q砅ƎXÄdƦ;",
-    "suspend": false
+    "completionMode": "汸\u003cƋlɋN磋镮ȺPÈɥ偁髕ģƗ鐫",
+    "suspend": true
   },
   "status": {
     "conditions": [
       {
-        "type": "氮怉ƥ;\"薑Ȣ#闬輙",
-        "status": "褅桃|",
-        "lastProbeTime": "2625-10-20T09:03:25Z",
-        "lastTransitionTime": "2222-01-27T15:06:59Z",
+        "type": "穌砊ʑȩ硘(ǒ[ȼ罦¦褅",
+        "status": "bCũw¼ ǫđ槴Ċį軠\u003e桼劑",
+        "lastProbeTime": "2377-08-03T07:30:10Z",
+        "lastTransitionTime": "2619-06-09T02:29:16Z",
         "reason": "482",
         "message": "483"
       }
     ],
-    "active": -882920248,
-    "succeeded": -1163607463,
-    "failed": -758431192,
+    "active": 157401294,
+    "succeeded": -702718077,
+    "failed": 648978003,
     "completedIndexes": "484"
   }
 }
diff --git a/testdata/HEAD/batch.v1.Job.pb b/testdata/HEAD/batch.v1.Job.pb
diff --git a/testdata/HEAD/batch.v1.Job.yaml b/testdata/HEAD/batch.v1.Job.yaml
@@ -32,7 +32,7 @@ metadata:
 spec:
   activeDeadlineSeconds: -5584804243908071872
   backoffLimit: -783752440
-  completionMode: ʉiUȡɭĮ庺%#囨q砅ƎXÄdƦ;
+  completionMode: 汸<ƋlɋN磋镮ȺPÈɥ偁髕ģƗ鐫
   completions: 1305381319
   manualSelector: true
   parallelism: 896585016
@@ -44,7 +44,7 @@ spec:
       - 3_bQw.-dG6c-.x
     matchLabels:
       hjT9s-j41-0-6p-JFHn7y-74.-0MUORQQ.N4: 3L.u
-  suspend: false
+  suspend: true
   template:
     metadata:
       annotations:
@@ -1046,14 +1046,14 @@ spec:
           volumePath: "101"
   ttlSecondsAfterFinished: 1020403419
 status:
-  active: -882920248
+  active: 157401294
   completedIndexes: "484"
   conditions:
-  - lastProbeTime: "2625-10-20T09:03:25Z"
-    lastTransitionTime: "2222-01-27T15:06:59Z"
+  - lastProbeTime: "2377-08-03T07:30:10Z"
+    lastTransitionTime: "2619-06-09T02:29:16Z"
     message: "483"
     reason: "482"
-    status: 褅桃|
-    type: 氮怉ƥ;"薑Ȣ#闬輙
-  failed: -758431192
-  succeeded: -1163607463
+    status: bCũw¼ ǫđ槴Ċį軠>桼劑
+    type: 穌砊ʑȩ硘(ǒ[ȼ罦¦褅
+  failed: 648978003
+  succeeded: -702718077
diff --git a/testdata/HEAD/batch.v1beta1.CronJob.json b/testdata/HEAD/batch.v1beta1.CronJob.json
@@ -1577,19 +1577,20 @@
           }
         },
         "ttlSecondsAfterFinished": -1285029915,
-        "suspend": true
+        "completionMode": "{ȃ騑ȫ(踶ǊđƟÝɹ橽ƴåj}c殶",
+        "suspend": false
       }
     },
-    "successfulJobsHistoryLimit": 1729066291,
-    "failedJobsHistoryLimit": -908823020
+    "successfulJobsHistoryLimit": -2006986560,
+    "failedJobsHistoryLimit": -380889943
   },
   "status": {
     "active": [
       {
         "kind": "505",
         "namespace": "506",
         "name": "507",
-        "uid": "`",
+        "uid": "暉Ŝ!ȣ绰",
         "apiVersion": "508",
         "resourceVersion": "509",
         "fieldPath": "510"

diff --git a/testdata/HEAD/batch.v1beta1.CronJob.pb b/testdata/HEAD/batch.v1beta1.CronJob.pb
diff --git a/testdata/HEAD/batch.v1beta1.CronJob.yaml b/testdata/HEAD/batch.v1beta1.CronJob.yaml
@@ -31,7 +31,7 @@ metadata:
   uid: "7"
 spec:
   concurrencyPolicy: Hr鯹)晿<o,c鮽ort昍řČ扷5Ɨ
-  failedJobsHistoryLimit: -908823020
+  failedJobsHistoryLimit: -380889943
   jobTemplate:
     metadata:
       annotations:
@@ -65,6 +65,7 @@ spec:
     spec:
       activeDeadlineSeconds: -1483125035702892746
       backoffLimit: -1822122846
+      completionMode: '{ȃ騑ȫ(踶ǊđƟÝɹ橽ƴåj}c殶'
       completions: -106888179
       manualSelector: true
       parallelism: -856030588
@@ -74,7 +75,7 @@ spec:
           operator: DoesNotExist
         matchLabels:
           2_kS91.e5K-_e63_-_3-n-_-__3u-.__P__.7U-Uo_4_-D7r__.am6-4_WE-_T: cd-2.-__E_Sv__26KX_R_.-.Nth._--S_4DAm
-      suspend: true
+      suspend: false
       template:
         metadata:
           annotations:
@@ -1081,7 +1082,7 @@ spec:
       ttlSecondsAfterFinished: -1285029915
   schedule: "19"
   startingDeadlineSeconds: -2555947251840004808
-  successfulJobsHistoryLimit: 1729066291
+  successfulJobsHistoryLimit: -2006986560
   suspend: true
 status:
   active:
@@ -1091,4 +1092,4 @@ status:
     name: "507"
     namespace: "506"
     resourceVersion: "509"
-    uid: '`'
+    uid: 暉Ŝ!ȣ绰
diff --git a/testdata/HEAD/batch.v1beta1.JobTemplate.json b/testdata/HEAD/batch.v1beta1.JobTemplate.json
@@ -1574,7 +1574,7 @@
         }
       },
       "ttlSecondsAfterFinished": -2143422853,
-      "completionMode": "Ŀř岈ǎǏ]S5:œƌ嵃ǁǞŢm珢\\%",
+      "completionMode": "烡Z树Ȁ謁Ƹɮ-nʣž吞Ƞ唄",
       "suspend": true
     }
   }

diff --git a/testdata/HEAD/batch.v1beta1.JobTemplate.pb b/testdata/HEAD/batch.v1beta1.JobTemplate.pb
diff --git a/testdata/HEAD/batch.v1beta1.JobTemplate.yaml b/testdata/HEAD/batch.v1beta1.JobTemplate.yaml
@@ -62,7 +62,7 @@ template:
   spec:
     activeDeadlineSeconds: -9086179100394185427
     backoffLimit: -1796008812
-    completionMode: Ŀř岈ǎǏ]S5:œƌ嵃ǁǞŢm珢\%
+    completionMode: 烡Z树Ȁ謁Ƹɮ-nʣž吞Ƞ唄
     completions: -1771909905
     manualSelector: false
     parallelism: -443114323

diff --git a/testdata/v1.19.0/batch.v1.Job.after_roundtrip.pb b/testdata/v1.19.0/batch.v1.Job.after_roundtrip.pb
diff --git a/testdata/v1.19.0/batch.v1beta1.CronJob.after_roundtrip.pb b/testdata/v1.19.0/batch.v1beta1.CronJob.after_roundtrip.pb
diff --git a/testdata/v1.19.0/batch.v1beta1.JobTemplate.after_roundtrip.pb b/testdata/v1.19.0/batch.v1beta1.JobTemplate.after_roundtrip.pb
diff --git a/testdata/v1.20.0/batch.v1.Job.after_roundtrip.pb b/testdata/v1.20.0/batch.v1.Job.after_roundtrip.pb
diff --git a/testdata/v1.20.0/batch.v1beta1.CronJob.after_roundtrip.pb b/testdata/v1.20.0/batch.v1beta1.CronJob.after_roundtrip.pb
diff --git a/testdata/v1.20.0/batch.v1beta1.JobTemplate.after_roundtrip.pb b/testdata/v1.20.0/batch.v1beta1.JobTemplate.after_roundtrip.pb