diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 248939bea17..af10f190c49 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -70759,7 +70759,7 @@
],
"properties": {
"concurrencyPolicy": {
- "description": "Specifies how to treat concurrent executions of a Job. Defaults to Allow.",
+ "description": "Specifies how to treat concurrent executions of a Job. Valid values are: - \"Allow\" (default): allows CronJobs to run concurrently; - \"Forbid\": forbids concurrent runs, skipping next run if previous run hasn't finished yet; - \"Replace\": cancels currently running job and replaces it with a new one",
"type": "string"
},
"failedJobsHistoryLimit": {
@@ -70894,7 +70894,7 @@
],
"properties": {
"concurrencyPolicy": {
- "description": "Specifies how to treat concurrent executions of a Job. Defaults to Allow.",
+ "description": "Specifies how to treat concurrent executions of a Job. Valid values are: - \"Allow\" (default): allows CronJobs to run concurrently; - \"Forbid\": forbids concurrent runs, skipping next run if previous run hasn't finished yet; - \"Replace\": cancels currently running job and replaces it with a new one",
"type": "string"
},
"failedJobsHistoryLimit": {
diff --git a/api/swagger-spec/batch_v1beta1.json b/api/swagger-spec/batch_v1beta1.json
index 0afb2acbf20..28b691322f4 100644
--- a/api/swagger-spec/batch_v1beta1.json
+++ b/api/swagger-spec/batch_v1beta1.json
@@ -1504,7 +1504,7 @@
},
"concurrencyPolicy": {
"type": "string",
- "description": "Specifies how to treat concurrent executions of a Job. Defaults to Allow."
+ "description": "Specifies how to treat concurrent executions of a Job. Valid values are: - \"Allow\" (default): allows CronJobs to run concurrently; - \"Forbid\": forbids concurrent runs, skipping next run if previous run hasn't finished yet; - \"Replace\": cancels currently running job and replaces it with a new one"
},
"suspend": {
"type": "boolean",
diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json
index aa4da614025..17c96621abf 100644
--- a/api/swagger-spec/batch_v2alpha1.json
+++ b/api/swagger-spec/batch_v2alpha1.json
@@ -1504,7 +1504,7 @@
},
"concurrencyPolicy": {
"type": "string",
- "description": "Specifies how to treat concurrent executions of a Job. Defaults to Allow."
+ "description": "Specifies how to treat concurrent executions of a Job. Valid values are: - \"Allow\" (default): allows CronJobs to run concurrently; - \"Forbid\": forbids concurrent runs, skipping next run if previous run hasn't finished yet; - \"Replace\": cancels currently running job and replaces it with a new one"
},
"suspend": {
"type": "boolean",
diff --git a/docs/api-reference/batch/v1beta1/definitions.html b/docs/api-reference/batch/v1beta1/definitions.html
index d57a984037b..14b0d0f9e05 100755
--- a/docs/api-reference/batch/v1beta1/definitions.html
+++ b/docs/api-reference/batch/v1beta1/definitions.html
@@ -3407,7 +3407,7 @@ When an object is created, the system will populate this list with the current s
concurrencyPolicy |
-Specifies how to treat concurrent executions of a Job. Defaults to Allow. |
+Specifies how to treat concurrent executions of a Job. Valid values are: - "Allow" (default): allows CronJobs to run concurrently; - "Forbid": forbids concurrent runs, skipping next run if previous run hasn’t finished yet; - "Replace": cancels currently running job and replaces it with a new one |
false |
string |
|
diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html
index 49df09a55bc..679989c8900 100755
--- a/docs/api-reference/batch/v2alpha1/definitions.html
+++ b/docs/api-reference/batch/v2alpha1/definitions.html
@@ -2173,7 +2173,7 @@ When an object is created, the system will populate this list with the current s
concurrencyPolicy |
-Specifies how to treat concurrent executions of a Job. Defaults to Allow. |
+Specifies how to treat concurrent executions of a Job. Valid values are: - "Allow" (default): allows CronJobs to run concurrently; - "Forbid": forbids concurrent runs, skipping next run if previous run hasn’t finished yet; - "Replace": cancels currently running job and replaces it with a new one |
false |
string |
|
diff --git a/pkg/apis/batch/types.go b/pkg/apis/batch/types.go
index be2b692f296..2cbf93d5d54 100644
--- a/pkg/apis/batch/types.go
+++ b/pkg/apis/batch/types.go
@@ -250,7 +250,10 @@ type CronJobSpec struct {
StartingDeadlineSeconds *int64
// Specifies how to treat concurrent executions of a Job.
- // Defaults to Allow.
+ // Valid values are:
+ // - "Allow" (default): allows CronJobs to run concurrently;
+ // - "Forbid": forbids concurrent runs, skipping next run if previous run hasn't finished yet;
+ // - "Replace": cancels currently running job and replaces it with a new one
// +optional
ConcurrencyPolicy ConcurrencyPolicy
diff --git a/staging/src/k8s.io/api/batch/v1beta1/generated.proto b/staging/src/k8s.io/api/batch/v1beta1/generated.proto
index f7b871632b2..11fa4e2aea1 100644
--- a/staging/src/k8s.io/api/batch/v1beta1/generated.proto
+++ b/staging/src/k8s.io/api/batch/v1beta1/generated.proto
@@ -71,7 +71,10 @@ message CronJobSpec {
optional int64 startingDeadlineSeconds = 2;
// Specifies how to treat concurrent executions of a Job.
- // Defaults to Allow.
+ // Valid values are:
+ // - "Allow" (default): allows CronJobs to run concurrently;
+ // - "Forbid": forbids concurrent runs, skipping next run if previous run hasn't finished yet;
+ // - "Replace": cancels currently running job and replaces it with a new one
// +optional
optional string concurrencyPolicy = 3;
diff --git a/staging/src/k8s.io/api/batch/v1beta1/types.go b/staging/src/k8s.io/api/batch/v1beta1/types.go
index ad13bba2f92..cb5c9bad294 100644
--- a/staging/src/k8s.io/api/batch/v1beta1/types.go
+++ b/staging/src/k8s.io/api/batch/v1beta1/types.go
@@ -100,7 +100,10 @@ type CronJobSpec struct {
StartingDeadlineSeconds *int64 `json:"startingDeadlineSeconds,omitempty" protobuf:"varint,2,opt,name=startingDeadlineSeconds"`
// Specifies how to treat concurrent executions of a Job.
- // Defaults to Allow.
+ // Valid values are:
+ // - "Allow" (default): allows CronJobs to run concurrently;
+ // - "Forbid": forbids concurrent runs, skipping next run if previous run hasn't finished yet;
+ // - "Replace": cancels currently running job and replaces it with a new one
// +optional
ConcurrencyPolicy ConcurrencyPolicy `json:"concurrencyPolicy,omitempty" protobuf:"bytes,3,opt,name=concurrencyPolicy,casttype=ConcurrencyPolicy"`
diff --git a/staging/src/k8s.io/api/batch/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/batch/v1beta1/types_swagger_doc_generated.go
index f4c74e4327e..3b53ac08a7d 100644
--- a/staging/src/k8s.io/api/batch/v1beta1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/batch/v1beta1/types_swagger_doc_generated.go
@@ -52,7 +52,7 @@ var map_CronJobSpec = map[string]string{
"": "CronJobSpec describes how the job execution will look like and when it will actually run.",
"schedule": "The schedule in Cron format, see https://en.wikipedia.org/wiki/Cron.",
"startingDeadlineSeconds": "Optional deadline in seconds for starting the job if it misses scheduled time for any reason. Missed jobs executions will be counted as failed ones.",
- "concurrencyPolicy": "Specifies how to treat concurrent executions of a Job. Defaults to Allow.",
+ "concurrencyPolicy": "Specifies how to treat concurrent executions of a Job. Valid values are: - \"Allow\" (default): allows CronJobs to run concurrently; - \"Forbid\": forbids concurrent runs, skipping next run if previous run hasn't finished yet; - \"Replace\": cancels currently running job and replaces it with a new one",
"suspend": "This flag tells the controller to suspend subsequent executions, it does not apply to already started executions. Defaults to false.",
"jobTemplate": "Specifies the job that will be created when executing a CronJob.",
"successfulJobsHistoryLimit": "The number of successful finished jobs to retain. This is a pointer to distinguish between explicit zero and not specified. Defaults to 3.",
diff --git a/staging/src/k8s.io/api/batch/v2alpha1/generated.proto b/staging/src/k8s.io/api/batch/v2alpha1/generated.proto
index 0bdb247e311..cc90d419096 100644
--- a/staging/src/k8s.io/api/batch/v2alpha1/generated.proto
+++ b/staging/src/k8s.io/api/batch/v2alpha1/generated.proto
@@ -71,7 +71,10 @@ message CronJobSpec {
optional int64 startingDeadlineSeconds = 2;
// Specifies how to treat concurrent executions of a Job.
- // Defaults to Allow.
+ // Valid values are:
+ // - "Allow" (default): allows CronJobs to run concurrently;
+ // - "Forbid": forbids concurrent runs, skipping next run if previous run hasn't finished yet;
+ // - "Replace": cancels currently running job and replaces it with a new one
// +optional
optional string concurrencyPolicy = 3;
diff --git a/staging/src/k8s.io/api/batch/v2alpha1/types.go b/staging/src/k8s.io/api/batch/v2alpha1/types.go
index 451df40e637..cccff94ff2a 100644
--- a/staging/src/k8s.io/api/batch/v2alpha1/types.go
+++ b/staging/src/k8s.io/api/batch/v2alpha1/types.go
@@ -100,7 +100,10 @@ type CronJobSpec struct {
StartingDeadlineSeconds *int64 `json:"startingDeadlineSeconds,omitempty" protobuf:"varint,2,opt,name=startingDeadlineSeconds"`
// Specifies how to treat concurrent executions of a Job.
- // Defaults to Allow.
+ // Valid values are:
+ // - "Allow" (default): allows CronJobs to run concurrently;
+ // - "Forbid": forbids concurrent runs, skipping next run if previous run hasn't finished yet;
+ // - "Replace": cancels currently running job and replaces it with a new one
// +optional
ConcurrencyPolicy ConcurrencyPolicy `json:"concurrencyPolicy,omitempty" protobuf:"bytes,3,opt,name=concurrencyPolicy,casttype=ConcurrencyPolicy"`
diff --git a/staging/src/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
index 2b3ed4c5602..d166b807fae 100644
--- a/staging/src/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
@@ -52,7 +52,7 @@ var map_CronJobSpec = map[string]string{
"": "CronJobSpec describes how the job execution will look like and when it will actually run.",
"schedule": "The schedule in Cron format, see https://en.wikipedia.org/wiki/Cron.",
"startingDeadlineSeconds": "Optional deadline in seconds for starting the job if it misses scheduled time for any reason. Missed jobs executions will be counted as failed ones.",
- "concurrencyPolicy": "Specifies how to treat concurrent executions of a Job. Defaults to Allow.",
+ "concurrencyPolicy": "Specifies how to treat concurrent executions of a Job. Valid values are: - \"Allow\" (default): allows CronJobs to run concurrently; - \"Forbid\": forbids concurrent runs, skipping next run if previous run hasn't finished yet; - \"Replace\": cancels currently running job and replaces it with a new one",
"suspend": "This flag tells the controller to suspend subsequent executions, it does not apply to already started executions. Defaults to false.",
"jobTemplate": "Specifies the job that will be created when executing a CronJob.",
"successfulJobsHistoryLimit": "The number of successful finished jobs to retain. This is a pointer to distinguish between explicit zero and not specified.",