Change IndividualJobRecreates to IndividualJobStatus.Recreates (#958)

* Change IndividualJobRecreates to IndividualJobStatus.Recreates

* Review comments

* Simplify resetIndividualJobRecreates

* Review nit

* Add documentation that Recreates is reset to 0 on JobSet restart

* Run make generate

* Create IndividualJobsStatus entry on job creation if it does not exist

* Add integration tests

Author: carreter

api/jobset/v1alpha2/jobset_types.go

@@ -185,10 +185,21 @@ type JobSetStatus struct {
 	// +listMapKey=name
 	ReplicatedJobsStatus []ReplicatedJobStatus `json:"replicatedJobsStatus,omitempty"`
 
-	// IndividualJobRecreates tracks the number of times an individual Job within
-	// the JobSet has been recreated (i.e. in case of RecreateJob failure policy).
+	// IndividualJobsStatus tracks the status of individual Jobs within ReplicatedJobs.
 	// +optional
-	IndividualJobRecreates map[string]int32 `json:"individualJobRecreates,omitempty"`
+	// +listType=map
+	// +listMapKey=name
+	IndividualJobsStatus []IndividualJobStatus `json:"individualJobsStatus,omitempty"`
+}
+
+// IndividualJobStatus holds the status of an individual Job within a ReplicatedJob.
+type IndividualJobStatus struct {
+	// Name of the Job.
+	Name string `json:"name"`
+
+	// Recreates is the number of times an individual Job has been recreated.
+	// This counter is reset to 0 if the parent ReplicatedJob or JobSet is restarted.
+	Recreates int32 `json:"recreates"`
 }
 
 // ReplicatedJobStatus defines the observed ReplicatedJobs Readiness.

api/jobset/v1alpha2/openapi_generated.go

@@ -9151,14 +9151,30 @@ spec:
                 x-kubernetes-list-map-keys:
                 - type
                 x-kubernetes-list-type: map
-              individualJobRecreates:
-                additionalProperties:
-                  format: int32
-                  type: integer
-                description: |-
-                  IndividualJobRecreates tracks the number of times an individual Job within
-                  the JobSet has been recreated (i.e. in case of RecreateJob failure policy).
-                type: object
+              individualJobsStatus:
+                description: IndividualJobsStatus tracks the status of individual
+                  Jobs within ReplicatedJobs.
+                items:
+                  description: IndividualJobStatus holds the status of an individual
+                    Job within a ReplicatedJob.
+                  properties:
+                    name:
+                      description: Name of the Job.
+                      type: string
+                    recreates:
+                      description: |-
+                        Recreates is the number of times an individual Job has been recreated.
+                        This counter is reset to 0 if the parent ReplicatedJob or JobSet is restarted.
+                      format: int32
+                      type: integer
+                  required:
+                  - name
+                  - recreates
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               replicatedJobsStatus:
                 description: ReplicatedJobsStatus track the number of JobsReady for
                   each replicatedJob.

api/jobset/v1alpha2/zz_generated.deepcopy.go

@@ -110,6 +110,27 @@
         }
       }
     },
+    "jobset.v1alpha2.IndividualJobStatus": {
+      "description": "IndividualJobStatus holds the status of an individual Job within a ReplicatedJob.",
+      "type": "object",
+      "required": [
+        "name",
+        "recreates"
+      ],
+      "properties": {
+        "name": {
+          "description": "Name of the Job.",
+          "type": "string",
+          "default": ""
+        },
+        "recreates": {
+          "description": "Recreates is the number of times an individual Job has been recreated. This counter is reset to 0 if the parent ReplicatedJob or JobSet is restarted.",
+          "type": "integer",
+          "format": "int32",
+          "default": 0
+        }
+      }
+    },
     "jobset.v1alpha2.JobSet": {
       "description": "JobSet is the Schema for the jobsets API",
       "type": "object",
@@ -124,7 +145,7 @@
         },
         "metadata": {
           "default": {},
-          "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.2/api/openapi-spec/swagger.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
+          "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.3/api/openapi-spec/swagger.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta"
         },
         "spec": {
           "default": {},
@@ -160,7 +181,7 @@
         },
         "metadata": {
           "default": {},
-          "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.2/api/openapi-spec/swagger.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"
+          "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.3/api/openapi-spec/swagger.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta"
         }
       }
     },
@@ -223,21 +244,24 @@
           "type": "array",
           "items": {
             "default": {},
-            "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.2/api/openapi-spec/swagger.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition"
+            "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.3/api/openapi-spec/swagger.json#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Condition"
           },
           "x-kubernetes-list-map-keys": [
             "type"
           ],
           "x-kubernetes-list-type": "map"
         },
-        "individualJobRecreates": {
-          "description": "IndividualJobRecreates tracks the number of times an individual Job within the JobSet has been recreated (i.e. in case of RecreateJob failure policy).",
-          "type": "object",
-          "additionalProperties": {
-            "type": "integer",
-            "format": "int32",
-            "default": 0
-          }
+        "individualJobsStatus": {
+          "description": "IndividualJobsStatus tracks the status of individual Jobs within ReplicatedJobs.",
+          "type": "array",
+          "items": {
+            "default": {},
+            "$ref": "#/definitions/jobset.v1alpha2.IndividualJobStatus"
+          },
+          "x-kubernetes-list-map-keys": [
+            "name"
+          ],
+          "x-kubernetes-list-type": "map"
         },
         "replicatedJobsStatus": {
           "description": "ReplicatedJobsStatus track the number of JobsReady for each replicatedJob.",
@@ -321,7 +345,7 @@
         "template": {
           "description": "Template defines the template of the Job that will be created.",
           "default": {},
-          "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.2/api/openapi-spec/swagger.json#/definitions/io.k8s.api.batch.v1.JobTemplateSpec"
+          "$ref": "https://raw.githubusercontent.com/kubernetes/kubernetes/refs/tags/v1.33.3/api/openapi-spec/swagger.json#/definitions/io.k8s.api.batch.v1.JobTemplateSpec"
         }
       }
     },