Merge branch 'main' into ci-cd-example-workflow

argoproj · Nov 13, 2024 · c296b67 · c296b67
2 parents 1d59d3d + f73e7f9
commit c296b67
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/docs/cron-workflows.md b/docs/cron-workflows.md
@@ -149,8 +149,8 @@ The second will not run because of the `when` expression, which prevents this wo
 
 > v3.6 and after
 
-You can configure a `CronWorkflow` to automatically stop based on an [expression](variables.md#expression) with `stopStrategy.condition`.
-You can use the [variables](variables.md#cronworkflows) `cronworkflow.failed` and `cronworkflow.succeede2d`.
+You can configure a `CronWorkflow` to automatically stop based on an [expression](variables.md#expression) with `stopStrategy.expression`.
+You can use the [variables](variables.md#cronworkflows) `cronworkflow.failed` and `cronworkflow.succeeded`.
 
 For example, if you want to stop scheduling new workflows after one success:
 

diff --git a/docs/fields.md b/docs/fields.md
@@ -1314,7 +1314,7 @@ CronWorkflowStatus is the status of a CronWorkflow
 |`conditions`|`Array<`[`Condition`](#condition)`>`|Conditions is a list of conditions the CronWorkflow may have|
 |`failed`|`integer`|v3.6 and after: Failed counts how many times child workflows failed|
 |`lastScheduledTime`|[`Time`](#time)|LastScheduleTime is the last time the CronWorkflow was scheduled|
-|`phase`|`string`|v3.6 and after: Phase is an enum of Active or Stopped. It changes to Stopped when stopStrategy.condition is true|
+|`phase`|`string`|v3.6 and after: Phase is an enum of Active or Stopped. It changes to Stopped when stopStrategy.expression is true|
 |`succeeded`|`integer`|v3.6 and after: Succeeded counts how many times child workflows succeeded|
 
 ## WorkflowEventBindingSpec

diff --git a/pkg/apis/workflow/v1alpha1/cron_workflow_types.go b/pkg/apis/workflow/v1alpha1/cron_workflow_types.go
@@ -90,7 +90,7 @@ type CronWorkflowStatus struct {
 	Succeeded int64 `json:"succeeded" protobuf:"varint,4,rep,name=succeeded"`
 	// v3.6 and after: Failed counts how many times child workflows failed
 	Failed int64 `json:"failed" protobuf:"varint,5,rep,name=failed"`
-	// v3.6 and after: Phase is an enum of Active or Stopped. It changes to Stopped when stopStrategy.condition is true
+	// v3.6 and after: Phase is an enum of Active or Stopped. It changes to Stopped when stopStrategy.expression is true
 	Phase CronWorkflowPhase `json:"phase" protobuf:"varint,6,rep,name=phase"`
 }
 

diff --git a/pkg/apis/workflow/v1alpha1/generated.proto b/pkg/apis/workflow/v1alpha1/generated.proto
diff --git a/pkg/apis/workflow/v1alpha1/openapi_generated.go b/pkg/apis/workflow/v1alpha1/openapi_generated.go
diff --git a/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1CronWorkflowStatus.md b/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1CronWorkflowStatus.md
diff --git a/.../python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_cron_workflow_status.py b/.../python/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_cron_workflow_status.py
diff --git a/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1CronWorkflowStatus.md b/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1CronWorkflowStatus.md