Skip to content

Commit

Permalink
Merge branch 'master' into feature/update-gcloud-api-packages
Browse files Browse the repository at this point in the history
  • Loading branch information
tczhao authored Jul 22, 2021
2 parents 54ec62c + f4b89dc commit a2fc1e4
Show file tree
Hide file tree
Showing 18 changed files with 1,483 additions and 30 deletions.
2 changes: 2 additions & 0 deletions USERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Currently, the following organizations are **officially** using Argo Workflows:
1. [bonprix](https://en.bonprix.de/corporate/our-company/)
1. [Canva](https://www.canva.com/)
1. [Capital One](https://www.capitalone.com/tech/)
1. [Carrefour](https://www.carrefour.com/)
1. [CarTrack](https://www.cartrack.com/)
1. [CCRi](https://www.ccri.com/)
1. [CloudSeeds](https://www.cloudseeds.de/)
Expand Down Expand Up @@ -128,6 +129,7 @@ Currently, the following organizations are **officially** using Argo Workflows:
1. [Wavefront](https://www.wavefront.com/)
1. [Wellcome Trust](https://wellcome.ac.uk/)
1. [VMware](https://www.vmware.com/)
1. [WooliesX](https://wooliesx.com.au/)
1. [Woolworths Group](https://www.woolworthsgroup.com.au/)
1. [Zhihu](https://www.zhihu.com/)

Expand Down
11 changes: 11 additions & 0 deletions cmd/argo/commands/cron/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,17 @@ func CreateCronWorkflows(filePaths []string, cliOpts *cliCreateOpts, submitOpts
log.Fatal(err)
}
cronWf.Spec.WorkflowSpec = newWf.Spec
// We have only copied the workflow spec to the cron workflow but not the metadata
// that includes name and generateName. Here we copy the metadata to the cron
// workflow's metadata and remove the unnecessary and mutually exclusive part.
if generateName := newWf.ObjectMeta.GenerateName; generateName != "" {
cronWf.ObjectMeta.GenerateName = generateName
cronWf.ObjectMeta.Name = ""
}
if name := newWf.ObjectMeta.Name; name != "" {
cronWf.ObjectMeta.Name = name
cronWf.ObjectMeta.GenerateName = ""
}
if cronWf.Namespace == "" {
cronWf.Namespace = client.Namespace()
}
Expand Down
1 change: 1 addition & 0 deletions docs/environment-variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Note that these environment variables may be removed at any time.
| `RETRY_BACKOFF_DURATION` | `time.Duration` | `10ms` | The retry backoff duration when retrying API calls. |
| `RETRY_BACKOFF_FACTOR` | `float` | `2.0` | The retry backoff factor when retrying API calls. |
| `RETRY_BACKOFF_STEPS` | `int` | `5` | The retry backoff steps when retrying API calls. |
| `RETRY_HOST_NAME_LABEL_KEY` | `string` | `kubernetes.io/hostname` | The label key for host name used when retrying templates. |
| `TRANSIENT_ERROR_PATTERN` | `string` | `""` | The regular expression that represents additional patterns for transient errors. |
| `WF_DEL_PROPAGATION_POLICY` | `string` | `""` | The deletion propagation policy for workflows. |
| `WORKFLOW_GC_PERIOD` | `time.Duration` | `5m` | The periodicity for GC of workflows. |
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ spec:
container:
image: alpine:latest
command: [sh, -c]
args: ["echo send e-mail: {{workflow.name}} {{workflow.status}}"]
args: ["echo send e-mail: {{workflow.name}} {{workflow.status}} {{workflow.duration}}"]
- name: celebrate
container:
image: alpine:latest
Expand Down
2 changes: 1 addition & 1 deletion examples/exit-handlers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
#
# Will print a list of all the failed steps and their messages. For more info look up the jq docs.
# Note: jq is not installed by default on the "alpine:latest" image, however it can be installed with "apk add jq"
args: ["echo send e-mail: {{workflow.name}} {{workflow.status}}. Failed steps {{workflow.failures}}"]
args: ["echo send e-mail: {{workflow.name}} {{workflow.status}} {{workflow.duration}}. Failed steps {{workflow.failures}}"]
- name: celebrate
container:
image: alpine:latest
Expand Down
Loading

0 comments on commit a2fc1e4

Please sign in to comment.