Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Human sort nested lists #1333

Merged
merged 2 commits into from
Mar 4, 2025
Merged

Human sort nested lists #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2588ce5
Human sort nested lists
jaseemabid Mar 4, 2025
2d93b79
Update examples to use correct ordering in steps
elliotgunton Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/examples/workflows/experimental/new_steps_decorator_with_parallel_steps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,30 +126,30 @@
steps:
- - name: setup-step
template: setup
- - arguments:
- - name: step-a
template: concat
arguments:
parameters:
- name: word_a
value: '{{inputs.parameters.value_a}}'
- name: word_b
value: '{{steps.setup-step.outputs.parameters.environment_parameter}}{{steps.setup-step.outputs.parameters.dummy-param}}'
name: step-a
- name: step-b
template: concat
- arguments:
arguments:
parameters:
- name: word_a
value: '{{inputs.parameters.value_b}}'
- name: word_b
value: '{{steps.setup-step.outputs.result}}'
name: step-b
- - name: final-step
template: concat
- - arguments:
arguments:
parameters:
- name: word_a
value: '{{steps.step-a.outputs.result}}'
- name: word_b
value: '{{steps.step-b.outputs.result}}'
name: final-step
template: concat
inputs:
parameters:
- name: value_a
Expand Down
10 changes: 5 additions & 5 deletions docs/examples/workflows/experimental/script_runner_io.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,18 @@
steps:
- - name: writer
template: writer
- - arguments:
- - name: pydantic-io
template: pydantic-io
arguments:
artifacts:
- from: '{{steps.writer.outputs.artifacts.int-artifact}}'
name: artifact-input
- name: artifact-input
from: '{{steps.writer.outputs.artifacts.int-artifact}}'
parameters:
- name: param_int
value: '101'
- name: an_object
value: '{"a_dict": {"my-new-key": "my-new-value"}, "a_str": "a default
string"}'
name: pydantic-io
template: pydantic-io
- name: writer
outputs:
artifacts:
Expand Down
14 changes: 7 additions & 7 deletions docs/examples/workflows/loops/script_loops_maps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@
templates:
- name: loop-map-example
steps:
- - arguments:
parameters:
- name: key_1
value: '{{item.key_1}}'
- name: key_2
value: '{{item.key_2}}'
name: test-key-mapping
- - name: test-key-mapping
template: test-key-mapping
withItems:
- key_1: value:1-1
Expand All @@ -60,6 +54,12 @@
key_2: value:2-3
- key_1: value:1-4
key_2: value:2-4
arguments:
parameters:
- name: key_1
value: '{{item.key_1}}'
- name: key_2
value: '{{item.key_2}}'
- name: test-key-mapping
inputs:
parameters:
Expand Down
2 changes: 1 addition & 1 deletion docs/examples/workflows/misc/container_with_resources.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
resources:
requests:
cpu: '1'
memory: 5Gi
ephemeral-storage: 5Gi
memory: 5Gi
```

6 changes: 3 additions & 3 deletions docs/examples/workflows/misc/resource_flags.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
- --validate=false
- name: resource-validate-example
steps:
- - continueOn:
failed: true
name: submit-resource
- - name: submit-resource
template: create-route
continueOn:
failed: true
- - name: submit-resource-without-validation
template: create-route-without-validation
when: '{{steps.submit-resource.status}} == Failed'
Expand Down
6 changes: 3 additions & 3 deletions docs/examples/workflows/misc/suspend_input_duration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
steps:
- - name: get-value-step
template: suspend-with-intermediate-param
- - arguments:
- - name: custom-delay-step
template: input-duration-suspend
arguments:
parameters:
- name: duration
value: '{{steps.get-value-step.outputs.parameters.duration}}'
name: custom-delay-step
template: input-duration-suspend
```

18 changes: 9 additions & 9 deletions docs/examples/workflows/misc/template_level_volume.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,23 +133,23 @@ See https://argo-workflows.readthedocs.io/en/latest/walk-through/volumes/
- name: pvc-name
- name: generate-and-use-volume
steps:
- - arguments:
- - name: generate-volume
template: generate-volume
arguments:
parameters:
- name: pvc-size
value: 1Gi
name: generate-volume
template: generate-volume
- - arguments:
- - name: generate
template: whalesay
arguments:
parameters:
- name: pvc-name
value: '{{steps.generate-volume.outputs.parameters.pvc-name}}'
name: generate
template: whalesay
- - arguments:
- - name: print
template: print-message
arguments:
parameters:
- name: pvc-name
value: '{{steps.generate-volume.outputs.parameters.pvc-name}}'
name: print
template: print-message
```

30 changes: 15 additions & 15 deletions docs/examples/workflows/scripts/callable_script.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,38 +110,38 @@
templates:
- name: my-steps
steps:
- - arguments:
- - name: my-function
template: my-function
arguments:
parameters:
- name: input
value: '{"a": 2, "b": "bar", "c": 42}'
name: my-function
template: my-function
- - arguments:
- - name: str-function
template: str-function
arguments:
parameters:
- name: input
value: '{"a": 2, "b": "bar", "c": 42}'
name: str-function
template: str-function
- - arguments:
- - name: another-function
template: another-function
arguments:
parameters:
- name: inputs
value: '[{"a": 2, "b": "bar", "c": 42}, {"a": 2, "b": "bar", "c": 42.0}]'
name: another-function
template: another-function
- - arguments:
- - name: function-kebab
template: function-kebab
arguments:
parameters:
- name: a-but-kebab
value: '3'
- name: b-but-kebab
value: bar
name: function-kebab
template: function-kebab
- - arguments:
- - name: function-kebab-object
template: function-kebab-object
arguments:
parameters:
- name: input-value
value: '{"a": 3, "b": "bar", "c": "42"}'
name: function-kebab-object
template: function-kebab-object
- name: my-function
inputs:
parameters:
Expand Down
30 changes: 15 additions & 15 deletions docs/examples/workflows/scripts/callable_script_v1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,38 +113,38 @@
templates:
- name: my-steps
steps:
- - arguments:
- - name: my-function
template: my-function
arguments:
parameters:
- name: input
value: '{"a": 2, "b": "bar", "c": 42}'
name: my-function
template: my-function
- - arguments:
- - name: str-function
template: str-function
arguments:
parameters:
- name: input
value: '{"a": 2, "b": "bar", "c": 42}'
name: str-function
template: str-function
- - arguments:
- - name: another-function
template: another-function
arguments:
parameters:
- name: inputs
value: '[{"a": 2, "b": "bar", "c": 42}, {"a": 2, "b": "bar", "c": 42.0}]'
name: another-function
template: another-function
- - arguments:
- - name: function-kebab
template: function-kebab
arguments:
parameters:
- name: a-but-kebab
value: '3'
- name: b-but-kebab
value: bar
name: function-kebab
template: function-kebab
- - arguments:
- - name: function-kebab-object
template: function-kebab-object
arguments:
parameters:
- name: input-value
value: '{"a": 3, "b": "bar", "c": "42"}'
name: function-kebab-object
template: function-kebab-object
- name: my-function
inputs:
parameters:
Expand Down
22 changes: 11 additions & 11 deletions docs/examples/workflows/scripts/script_annotations_artifact_custom_volume.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,24 +99,24 @@ This example will reuse the outputs volume across script steps.
templates:
- name: my-steps
steps:
- - arguments:
- - name: output-artifact-empty-dir
template: output-artifact-empty-dir
arguments:
parameters:
- name: a_number
value: '3'
name: output-artifact-empty-dir
template: output-artifact-empty-dir
- - arguments:
artifacts:
- from: '{{steps.output-artifact-empty-dir.outputs.artifacts.successor_out}}'
name: successor_in
name: use-artifact
- - name: use-artifact
template: use-artifact
- - arguments:
arguments:
artifacts:
- name: successor_in
from: '{{steps.output-artifact-empty-dir.outputs.artifacts.successor_out}}'
- - name: output-artifact-existing-vol
template: output-artifact-existing-vol
arguments:
parameters:
- name: a_number
value: '3'
name: output-artifact-existing-vol
template: output-artifact-existing-vol
- - name: use-artifact-existing-vol
template: use-artifact-existing-vol
- name: output-artifact-empty-dir
Expand Down
24 changes: 12 additions & 12 deletions docs/examples/workflows/scripts/script_annotations_artifact_loaders.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@
templates:
- name: my-steps
steps:
- - arguments:
- - name: output-dict-artifact
template: output-dict-artifact
arguments:
parameters:
- name: a_number
value: '3'
name: output-dict-artifact
template: output-dict-artifact
- - arguments:
artifacts:
- from: '{{steps.output-dict-artifact.outputs.artifacts.a_dict}}'
name: my-artifact-path
- from: '{{steps.output-dict-artifact.outputs.artifacts.a_dict}}'
name: my-artifact-as-str
- from: '{{steps.output-dict-artifact.outputs.artifacts.a_dict}}'
name: my-artifact-as-json
name: artifact-loaders
- - name: artifact-loaders
template: artifact-loaders
arguments:
artifacts:
- name: my-artifact-path
from: '{{steps.output-dict-artifact.outputs.artifacts.a_dict}}'
- name: my-artifact-as-str
from: '{{steps.output-dict-artifact.outputs.artifacts.a_dict}}'
- name: my-artifact-as-json
from: '{{steps.output-dict-artifact.outputs.artifacts.a_dict}}'
- name: output-dict-artifact
inputs:
parameters:
Expand Down
16 changes: 8 additions & 8 deletions docs/examples/workflows/scripts/script_annotations_artifact_outputs_defaults.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@ This example will reuse the outputs volume across script steps.
templates:
- name: my-steps
steps:
- - arguments:
- - name: output-artifact
template: output-artifact
arguments:
parameters:
- name: a_number
value: '3'
name: output-artifact
template: output-artifact
- - arguments:
artifacts:
- from: '{{steps.output-artifact.outputs.artifacts.successor_out}}'
name: successor_in
name: use-artifact
- - name: use-artifact
template: use-artifact
arguments:
artifacts:
- name: successor_in
from: '{{steps.output-artifact.outputs.artifacts.successor_out}}'
- name: output-artifact
inputs:
parameters:
Expand Down
16 changes: 8 additions & 8 deletions docs/examples/workflows/scripts/script_annotations_artifact_passing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@ This example will reuse the outputs volume across script steps.
templates:
- name: my-steps
steps:
- - arguments:
- - name: output-artifact
template: output-artifact
arguments:
parameters:
- name: a_number
value: '3'
name: output-artifact
template: output-artifact
- - arguments:
artifacts:
- from: '{{steps.output-artifact.outputs.artifacts.successor_out}}'
name: successor_in
name: use-artifact
- - name: use-artifact
template: use-artifact
arguments:
artifacts:
- name: successor_in
from: '{{steps.output-artifact.outputs.artifacts.successor_out}}'
- name: output-artifact
inputs:
parameters:
Expand Down
Loading
Loading