Skip to content

Commit 86eae7d

Browse files
committed
Merge remote-tracking branch 'upstream/master' into release-3.2
2 parents 2c3ac70 + 87a5732 commit 86eae7d

40 files changed

+3132
-564
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
---
22
name: Reproducible bug report
33
about: Create a reproducible bug report. Not for support requests.
4-
labels: 'bug'
4+
labels: ['bug', 'triage']
55
---
6-
## Summary
7-
8-
What happened/what you expected to happen?
9-
6+
<!--
107
Before we start, around 2/3 of issues can be fixed by one of the following:
118
129
* Have you double-checked your configuration? Maybe 30% of issues are wrong configuration.
1310
* Have you tested to see if it is fixed in the latest version? Maybe 20% of issues are fixed by this.
14-
* Have you tried using the PNS executer instead of Docker? Maybe 50% of artifact related issues are fixed by this.
11+
* Have you tried using the PNS executor instead of Docker? Maybe 50% of artifact related issues are fixed by this.
1512
16-
## Diagnostics
13+
If this is a regression, please open a regression report instead.
14+
-->
1715

18-
👀 Yes! We need all of your diagnostics, please make sure you add it all, otherwise we'll go around in circles asking you for it:
16+
## Summary
1917

20-
What Kubernetes provider are you using?
21-
22-
What version of Argo Workflows are you running?
18+
What happened/what you expected to happen?
2319

24-
What executor are you running? Docker/K8SAPI/Kubelet/PNS/Emissary
20+
What version of Argo Workflows are you running?
2521

26-
Did this work in a previous version? I.e. is it a regression?
22+
## Diagnostics
2723

28-
Are you pasting thousands of log lines? That's too much information.
24+
Either a workflow that reproduces the bug, or paste you whole workflow YAML, including status, something like:
2925

30-
```bash
31-
# Either a workflow that reproduces the bug, or paste you whole workflow YAML, including status, something like:
26+
```yaml
3227
kubectl get wf -o yaml ${workflow}
28+
```
29+
30+
What Kubernetes provider are you using?
3331

32+
What executor are you running? Docker/K8SAPI/Kubelet/PNS/Emissary
33+
34+
```bash
3435
# Logs from the workflow controller:
3536
kubectl logs -n argo deploy/workflow-controller | grep ${workflow}
3637

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
name: Regression report
3+
about: Create a regression report. Not for support requests.
4+
labels: ['bug', 'regression', 'triage']
5+
---
6+
## Summary
7+
8+
What happened/what you expected to happen?
9+
10+
What version is it broken in?
11+
12+
What version was it working in?
13+
14+
## Diagnostics
15+
16+
Either a workflow that reproduces the bug, or paste you whole workflow YAML, including status, something like:
17+
18+
```yaml
19+
kubectl get wf -o yaml ${workflow}
20+
```
21+
22+
What Kubernetes provider are you using?
23+
24+
What executor are you running? Docker/K8SAPI/Kubelet/PNS/Emissary
25+
26+
```bash
27+
# Logs from the workflow controller:
28+
kubectl logs -n argo deploy/workflow-controller | grep ${workflow}
29+
30+
# The workflow's pods that are problematic:
31+
kubectl get pod -o yaml -l workflows.argoproj.io/workflow=${workflow},workflow.argoproj.io/phase!=Succeeded
32+
33+
# Logs from in your workflow's wait container, something like:
34+
kubectl logs -c wait -l workflows.argoproj.io/workflow=${workflow},workflow.argoproj.io/phase!=Succeeded
35+
```
36+
37+
---
38+
<!-- Issue Author: Don't delete this message to encourage other users to support your issue! -->
39+
**Message from the maintainers**:
40+
41+
Impacted by this bug? Give it a 👍. We prioritise the issues with the most 👍.

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## v3.2.0-rc4 (2021-09-21)
4+
5+
* [710e82366](https://github.com/argoproj/argo-workflows/commit/710e82366dc3b0b17f5bf52004d2f72622de7781) fix: fix a typo in example file dag-conditional-artifacts.yaml (#6775)
6+
* [b82884600](https://github.com/argoproj/argo-workflows/commit/b8288460052125641ff1b4e1bcc4ee03ecfe319b) feat: upgrade Argo Dataflow to v0.0.104 (#6749)
7+
* [1a76e6581](https://github.com/argoproj/argo-workflows/commit/1a76e6581dd079bdcfc76be545b3f7dd1ba48105) fix(controller): TestPodExists unit test (#6763)
8+
* [6875479db](https://github.com/argoproj/argo-workflows/commit/6875479db8c466c443acbc15a3fe04d8d6a8b1d2) fix: Daemond status stuck with Running (#6742)
9+
* [e5b131a33](https://github.com/argoproj/argo-workflows/commit/e5b131a333afac0ed3444b70e2fe846b86dc63e1) feat: Add template node to pod name. Fixes #1319 (#6712)
10+
11+
### Contributors
12+
13+
* Alex Collins
14+
* J.P. Zivalich
15+
* Saravanan Balasubramanian
16+
* TCgogogo
17+
* Tianchu Zhao
18+
319
## v3.2.0-rc3 (2021-09-14)
420

521
* [69e438426](https://github.com/argoproj/argo-workflows/commit/69e438426e4d116e2c9a1716651af7ef14864f04) fix: correct minor typos in docs (#6722)
@@ -227,6 +243,20 @@
227243
* meijin
228244
* wanghong230
229245

246+
## v3.1.13 (2021-09-28)
247+
248+
* [78cd6918a](https://github.com/argoproj/argo-workflows/commit/78cd6918a8753a8448ed147b875588d56bd26252) fix: Missing duration metrics if controller restart (#6815)
249+
* [1fe754ef1](https://github.com/argoproj/argo-workflows/commit/1fe754ef10bd95e3fe3485f67fa7e9c5523b1dea) fix: Fix expression template random errors. Fixes #6673 (#6786)
250+
* [3a98174da](https://github.com/argoproj/argo-workflows/commit/3a98174dace34ffac7dd7626a253bbb1101df515) fix: Fix bugs, unable to resolve tasks aggregated outputs in dag outputs. Fixes #6684 (#6692)
251+
* [6e93af099](https://github.com/argoproj/argo-workflows/commit/6e93af099d1c93d1d27fc86aba6d074d6d79cffc) fix: remove windows UNC paths from wait/init containers. Fixes #6583 (#6704)
252+
253+
### Contributors
254+
255+
* Alex Collins
256+
* Anish Dangi
257+
* Saravanan Balasubramanian
258+
* smile-luobin
259+
230260
## v3.1.12 (2021-09-16)
231261

232262
* [e62b9a8dc](https://github.com/argoproj/argo-workflows/commit/e62b9a8dc8924e545d57d1f90f901fbb0b694e09) feat(ui): logsViewer use archived log if node finish and archived (#6708)

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ RUN JOBS=max yarn --cwd ui install --network-timeout 1000000
7575
COPY ui ui
7676
COPY api api
7777

78-
RUN JOBS=max yarn --cwd ui build
78+
RUN NODE_OPTIONS="--max-old-space-size=2048" JOBS=max yarn --cwd ui build
7979

8080
####################################################################################################
8181

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ endif
8888
ARGOEXEC_PKGS := $(shell echo cmd/argoexec && go list -f '{{ join .Deps "\n" }}' ./cmd/argoexec/ | grep 'argoproj/argo-workflows/v3/' | cut -c 39-)
8989
CLI_PKGS := $(shell echo cmd/argo && go list -f '{{ join .Deps "\n" }}' ./cmd/argo/ | grep 'argoproj/argo-workflows/v3/' | cut -c 39-)
9090
CONTROLLER_PKGS := $(shell echo cmd/workflow-controller && go list -f '{{ join .Deps "\n" }}' ./cmd/workflow-controller/ | grep 'argoproj/argo-workflows/v3/' | cut -c 39-)
91-
E2E_EXECUTOR ?= pns
91+
E2E_EXECUTOR ?= emissary
9292
TYPES := $(shell find pkg/apis/workflow/v1alpha1 -type f -name '*.go' -not -name openapi_generated.go -not -name '*generated*' -not -name '*test.go')
9393
CRDS := $(shell find manifests/base/crds -type f -name 'argoproj.io_*.yaml')
9494
SWAGGER_FILES := pkg/apiclient/_.primary.swagger.json \
@@ -450,7 +450,7 @@ endif
450450
grep '127.0.0.1[[:blank:]]*mysql' /etc/hosts
451451
./hack/port-forward.sh
452452
ifeq ($(RUN_MODE),local)
453-
env DEFAULT_REQUEUE_TIME=$(DEFAULT_REQUEUE_TIME) SECURE=$(SECURE) ALWAYS_OFFLOAD_NODE_STATUS=$(ALWAYS_OFFLOAD_NODE_STATUS) LOG_LEVEL=$(LOG_LEVEL) UPPERIO_DB_DEBUG=$(UPPERIO_DB_DEBUG) IMAGE_NAMESPACE=$(IMAGE_NAMESPACE) VERSION=$(VERSION) AUTH_MODE=$(AUTH_MODE) NAMESPACED=$(NAMESPACED) NAMESPACE=$(KUBE_NAMESPACE) MANAGED_NAMESPACE=$(MANAGED_NAMESPACE) UI=$() $(GOPATH)/bin/goreman -set-ports=false -logtime=false start $(shell if [ -z $GREP_LOGS ]; then echo; else echo "| grep \"$(GREP_LOGS)\""; fi)
453+
env DEFAULT_REQUEUE_TIME=$(DEFAULT_REQUEUE_TIME) SECURE=$(SECURE) ALWAYS_OFFLOAD_NODE_STATUS=$(ALWAYS_OFFLOAD_NODE_STATUS) LOG_LEVEL=$(LOG_LEVEL) UPPERIO_DB_DEBUG=$(UPPERIO_DB_DEBUG) IMAGE_NAMESPACE=$(IMAGE_NAMESPACE) VERSION=$(VERSION) AUTH_MODE=$(AUTH_MODE) NAMESPACED=$(NAMESPACED) NAMESPACE=$(KUBE_NAMESPACE) MANAGED_NAMESPACE=$(MANAGED_NAMESPACE) UI=$(UI) $(GOPATH)/bin/goreman -set-ports=false -logtime=false start $(shell if [ -z $GREP_LOGS ]; then echo; else echo "| grep \"$(GREP_LOGS)\""; fi)
454454
endif
455455

456456
$(GOPATH)/bin/stern:
@@ -512,7 +512,7 @@ pkg/apis/workflow/v1alpha1/openapi_generated.go: $(GOPATH)/bin/openapi-gen $(TYP
512512
pkg/apis/workflow/v1alpha1/zz_generated.deepcopy.go: $(TYPES)
513513
[ -e ./vendor ] || go mod vendor
514514
[ -e ./v3 ] || ln -s . v3
515-
bash $(GOPATH)/pkg/mod/k8s.io/code-generator@v0.20.4/generate-groups.sh \
515+
bash $(GOPATH)/pkg/mod/k8s.io/code-generator@v0.21.5/generate-groups.sh \
516516
"deepcopy,client,informer,lister" \
517517
github.com/argoproj/argo-workflows/v3/pkg/client github.com/argoproj/argo-workflows/v3/pkg/apis \
518518
workflow:v1alpha1 \

USERS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Argo Workflows User Community Surveys & Feedback
22

3-
Please find [here](community/ArgoWorkflows2020SurveySummary.pdf) Argo Workflows user community 2020 survey results.
3+
Please find [here](https://github.com/argoproj/argoproj/blob/master/community/user_surveys/ArgoWorkflows2020SurveySummary.pdf) Argo Workflows user community 2020 survey results.
44

55
## Who uses Argo Workflows?
66

@@ -37,6 +37,7 @@ Currently, the following organizations are **officially** using Argo Workflows:
3737
1. [Carrefour](https://www.carrefour.com/)
3838
1. [CarTrack](https://www.cartrack.com/)
3939
1. [CCRi](https://www.ccri.com/)
40+
1. [Cisco](https://www.cisco.com/)
4041
1. [CloudSeeds](https://www.cloudseeds.de/)
4142
1. [Codec](https://www.codec.ai/)
4243
1. [Commodus Tech](https://www.commodus.tech)
@@ -74,6 +75,7 @@ Currently, the following organizations are **officially** using Argo Workflows:
7475
1. [HOVER](https://hover.to)
7576
1. [HSBC](https://hsbc.com)
7677
1. [IBM](https://ibm.com)
78+
1. [incrmntal](https://incrmntal.com/)
7779
1. [InsideBoard](https://www.insideboard.com)
7880
1. [Interline Technologies](https://www.interline.io/blog/scaling-openstreetmap-data-workflows/)
7981
1. [Intralinks](https://www.intralinks.com/)

api/jsonschema/schema.json

Lines changed: 59 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4427,7 +4427,14 @@
44274427
"metadata",
44284428
"spec"
44294429
],
4430-
"type": "object"
4430+
"type": "object",
4431+
"x-kubernetes-group-version-kind": [
4432+
{
4433+
"group": "argoproj.io",
4434+
"kind": "ClusterWorkflowTemplate",
4435+
"version": "v1alpha1"
4436+
}
4437+
]
44314438
},
44324439
"io.argoproj.workflow.v1alpha1.ClusterWorkflowTemplateCreateRequest": {
44334440
"properties": {
@@ -4588,7 +4595,7 @@
45884595
},
45894596
"resources": {
45904597
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements",
4591-
"description": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/"
4598+
"description": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/"
45924599
},
45934600
"securityContext": {
45944601
"$ref": "#/definitions/io.k8s.api.core.v1.SecurityContext",
@@ -4742,7 +4749,14 @@
47424749
"metadata",
47434750
"spec"
47444751
],
4745-
"type": "object"
4752+
"type": "object",
4753+
"x-kubernetes-group-version-kind": [
4754+
{
4755+
"group": "argoproj.io",
4756+
"kind": "CronWorkflow",
4757+
"version": "v1alpha1"
4758+
}
4759+
]
47464760
},
47474761
"io.argoproj.workflow.v1alpha1.CronWorkflowDeletedResponse": {
47484762
"type": "object"
@@ -6275,7 +6289,7 @@
62756289
},
62766290
"resources": {
62776291
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements",
6278-
"description": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/"
6292+
"description": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/"
62796293
},
62806294
"securityContext": {
62816295
"$ref": "#/definitions/io.k8s.api.core.v1.SecurityContext",
@@ -6860,7 +6874,7 @@
68606874
},
68616875
"resources": {
68626876
"$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements",
6863-
"description": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/"
6877+
"description": "Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/"
68646878
},
68656879
"securityContext": {
68666880
"$ref": "#/definitions/io.k8s.api.core.v1.SecurityContext",
@@ -7036,7 +7050,14 @@
70367050
"metadata",
70377051
"spec"
70387052
],
7039-
"type": "object"
7053+
"type": "object",
7054+
"x-kubernetes-group-version-kind": [
7055+
{
7056+
"group": "argoproj.io",
7057+
"kind": "Workflow",
7058+
"version": "v1alpha1"
7059+
}
7060+
]
70407061
},
70417062
"io.argoproj.workflow.v1alpha1.WorkflowCreateRequest": {
70427063
"properties": {
@@ -7086,7 +7107,14 @@
70867107
"metadata",
70877108
"spec"
70887109
],
7089-
"type": "object"
7110+
"type": "object",
7111+
"x-kubernetes-group-version-kind": [
7112+
{
7113+
"group": "argoproj.io",
7114+
"kind": "WorkflowEventBinding",
7115+
"version": "v1alpha1"
7116+
}
7117+
]
70907118
},
70917119
"io.argoproj.workflow.v1alpha1.WorkflowEventBindingList": {
70927120
"description": "WorkflowEventBindingList is list of event resources",
@@ -7248,6 +7276,10 @@
72487276
"$ref": "#/definitions/io.k8s.api.core.v1.Affinity",
72497277
"description": "Affinity sets the scheduling constraints for all pods in the io.argoproj.workflow.v1alpha1. Can be overridden by an affinity specified in the template"
72507278
},
7279+
"archiveLogs": {
7280+
"description": "ArchiveLogs indicates if the container logs should be archived",
7281+
"type": "boolean"
7282+
},
72517283
"arguments": {
72527284
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.Arguments",
72537285
"description": "Arguments contain the parameters and artifacts sent to the workflow entrypoint Parameters are referencable globally using the 'workflow' variable prefix. e.g. {{io.argoproj.workflow.v1alpha1.parameters.myparam}}"
@@ -7648,7 +7680,14 @@
76487680
"metadata",
76497681
"spec"
76507682
],
7651-
"type": "object"
7683+
"type": "object",
7684+
"x-kubernetes-group-version-kind": [
7685+
{
7686+
"group": "argoproj.io",
7687+
"kind": "WorkflowTaskSet",
7688+
"version": "v1alpha1"
7689+
}
7690+
]
76527691
},
76537692
"io.argoproj.workflow.v1alpha1.WorkflowTaskSetSpec": {
76547693
"properties": {
@@ -7696,7 +7735,14 @@
76967735
"metadata",
76977736
"spec"
76987737
],
7699-
"type": "object"
7738+
"type": "object",
7739+
"x-kubernetes-group-version-kind": [
7740+
{
7741+
"group": "argoproj.io",
7742+
"kind": "WorkflowTemplate",
7743+
"version": "v1alpha1"
7744+
}
7745+
]
77007746
},
77017747
"io.argoproj.workflow.v1alpha1.WorkflowTemplateCreateRequest": {
77027748
"properties": {
@@ -7781,6 +7827,10 @@
77817827
"$ref": "#/definitions/io.k8s.api.core.v1.Affinity",
77827828
"description": "Affinity sets the scheduling constraints for all pods in the io.argoproj.workflow.v1alpha1. Can be overridden by an affinity specified in the template"
77837829
},
7830+
"archiveLogs": {
7831+
"description": "ArchiveLogs indicates if the container logs should be archived",
7832+
"type": "boolean"
7833+
},
77847834
"arguments": {
77857835
"$ref": "#/definitions/io.argoproj.workflow.v1alpha1.Arguments",
77867836
"description": "Arguments contain the parameters and artifacts sent to the workflow entrypoint Parameters are referencable globally using the 'workflow' variable prefix. e.g. {{io.argoproj.workflow.v1alpha1.parameters.myparam}}"
@@ -8593,10 +8643,6 @@
85938643
"io.k8s.api.core.v1.EphemeralVolumeSource": {
85948644
"description": "Represents an ephemeral volume that is handled by a normal storage driver.",
85958645
"properties": {
8596-
"readOnly": {
8597-
"title": "Specifies a read-only configuration for the volume.\nDefaults to false (read/write).\n+optional",
8598-
"type": "boolean"
8599-
},
86008646
"volumeClaimTemplate": {
86018647
"$ref": "#/definitions/io.k8s.api.core.v1.PersistentVolumeClaimTemplate",
86028648
"description": "Will be used to create a stand-alone PVC to provision the volume.\nThe pod in which this EphemeralVolumeSource is embedded will be the\nowner of the PVC, i.e. the PVC will be deleted together with the\npod. The name of the PVC will be `\u003cpod name\u003e-\u003cvolume name\u003e` where\n`\u003cvolume name\u003e` is the name from the `PodSpec.Volumes` array\nentry. Pod validation will reject the pod if the concatenated name\nis not valid for a PVC (for example, too long).\n\nAn existing PVC with that name that is not owned by the pod\nwill *not* be used for the pod to avoid using an unrelated\nvolume by mistake. Starting the pod is then blocked until\nthe unrelated PVC is removed. If such a pre-created PVC is\nmeant to be used by the pod, the PVC has to updated with an\nowner reference to the pod once the pod exists. Normally\nthis should not be necessary, but it may be useful when\nmanually reconstructing a broken cluster.\n\nThis field is read-only and no changes will be made by Kubernetes\nto the PVC after it has been created.\n\nRequired, must not be nil."

0 commit comments

Comments
 (0)