Skip to content

Commit 0546fef

Browse files
committed
Merge branch 'master' into release-3.4
Signed-off-by: Saravanan Balasubramanian <[email protected]>
2 parents 047952a + 365b6df commit 0546fef

File tree

118 files changed

+2542
-567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2542
-567
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 47 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Reproducible bug report
2+
description: Create a reproducible bug report. Not for support requests.
3+
labels: [ bug ]
4+
body:
5+
- type: checkboxes
6+
id: terms
7+
attributes:
8+
label: Pre-requisites
9+
options:
10+
- label: I have double-checked my configuration
11+
required: true
12+
- label: I can confirm the issues exists when I tested with `:latest`
13+
required: true
14+
- label: I'd like to contribute the fix myself (see [contributing guide](https://github.com/argoproj/argo-workflows/blob/master/docs/CONTRIBUTING.md))
15+
- type: textarea
16+
id: description
17+
attributes:
18+
label: What happened/what you expected to happen?
19+
validations:
20+
required: true
21+
- type: input
22+
id: version
23+
attributes:
24+
label: Version
25+
placeholder: e.g. v3.3.8 or latest
26+
validations:
27+
required: true
28+
- type: textarea
29+
id: failing-workflow
30+
attributes:
31+
label: Paste a small workflow that reproduces the issue. We must be able to run the workflow; don't enter a workflows that uses private images.
32+
render: YAML
33+
validations:
34+
required: true
35+
- type: textarea
36+
id: controller-logs
37+
attributes:
38+
label: Logs from the workflow controller
39+
value: kubectl logs -n argo deploy/workflow-controller | grep ${workflow}
40+
validations:
41+
required: true
42+
- type: textarea
43+
id: wait-logs
44+
attributes:
45+
label: Logs from in your workflow's wait container
46+
value: kubectl logs -c wait -l workflows.argoproj.io/workflow=${workflow},workflow.argoproj.io/phase!=Succeeded
47+
validations:
48+
required: true

.github/ISSUE_TEMPLATE/regression.md

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Regression report
2+
description: Create a regression report. Not for support requests.
3+
labels: [ bug, regression ]
4+
5+
body:
6+
- type: checkboxes
7+
id: terms
8+
attributes:
9+
label: Pre-requisites
10+
options:
11+
- label: I have double-checked my configuration
12+
required: true
13+
- label: I can confirm the issues exists when I tested with `:latest`
14+
required: true
15+
- label: I'd like to contribute the fix myself (see [contributing guide](https://github.com/argoproj/argo-workflows/blob/master/docs/CONTRIBUTING.md))
16+
- type: textarea
17+
id: description
18+
attributes:
19+
label: What happened/what you expected to happen?
20+
validations:
21+
required: true
22+
- type: input
23+
id: version
24+
attributes:
25+
label: Version
26+
placeholder: e.g. v3.3.8 or latest
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: failing-workflow
31+
attributes:
32+
label: Paste a small workflow that reproduces the issue. We must be able to run the workflow; don't enter a workflows that uses private images.
33+
render: YAML
34+
validations:
35+
required: true
36+
- type: textarea
37+
id: controller-logs
38+
attributes:
39+
label: Logs from the workflow controller
40+
value: kubectl logs -n argo deploy/workflow-controller | grep ${workflow}
41+
validations:
42+
required: true
43+
- type: textarea
44+
id: wait-logs
45+
attributes:
46+
label: Logs from in your workflow's wait container
47+
value: kubectl logs -c wait -l workflows.argoproj.io/workflow=${workflow},workflow.argoproj.io/phase!=Succeeded
48+
validations:
49+
required: true

.github/workflows/ci-build.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,13 @@ jobs:
157157
- run: make start PROFILE=${{matrix.profile}} AUTH_MODE=client STATIC_FILES=false LOG_LEVEL=info API=${{matrix.test == 'test-api' || matrix.test == 'test-cli' || matrix.test == 'test-java-sdk' || matrix.test == 'test-python-sdk'}} UI=false AZURE=true > /tmp/argo.log 2>&1 &
158158
- run: make wait
159159
timeout-minutes: 4
160-
- run: make ${{matrix.test}} E2E_SUITE_TIMEOUT=20m STATIC_FILES=false AZURE=true
160+
- name: make ${{matrix.test}}
161+
# https://github.com/marketplace/actions/retry-step
162+
uses: nick-fields/[email protected]
163+
with:
164+
timeout_minutes: 20
165+
max_attempts: 2
166+
command: make ${{matrix.test}} E2E_SUITE_TIMEOUT=20m STATIC_FILES=false AZURE=true
161167
- if: ${{ failure() }}
162168
run: |
163169
[ -e /tmp/argo.log ] && cat /tmp/argo.log
@@ -173,7 +179,7 @@ jobs:
173179
- uses: actions/checkout@v3
174180
- uses: actions/setup-go@v3
175181
with:
176-
go-version: "1.18"
182+
go-version: "1.19"
177183
- uses: actions/cache@v3
178184
with:
179185
path: |
@@ -185,9 +191,9 @@ jobs:
185191
- name: Install protoc
186192
run: |
187193
set -eux -o pipefail
188-
curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.1/protoc-3.11.1-linux-x86_64.zip
189-
sudo unzip -o protoc-3.11.1-linux-x86_64.zip -d /usr/local bin/protoc
190-
sudo unzip -o protoc-3.11.1-linux-x86_64.zip -d /usr/local 'include/*'
194+
curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip
195+
sudo unzip -o protoc-3.19.4-linux-x86_64.zip -d /usr/local bin/protoc
196+
sudo unzip -o protoc-3.19.4-linux-x86_64.zip -d /usr/local 'include/*'
191197
sudo chmod +x /usr/local/bin/protoc
192198
sudo find /usr/local/include -type f | xargs sudo chmod a+r
193199
sudo find /usr/local/include -type d | xargs sudo chmod a+rx

.golangci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ run:
2525
linters:
2626
enable:
2727
- bodyclose
28-
- deadcode
2928
- errcheck
3029
- goimports
3130
# only minor issues
@@ -41,11 +40,9 @@ linters:
4140
- rowserrcheck
4241
- sqlclosecheck
4342
- staticcheck
44-
- structcheck
4543
- typecheck
4644
- unparam
4745
- unused
48-
- varcheck
4946
linters-settings:
5047
goimports:
5148
local-prefixes: github.com/argoproj/argo-workflows/
@@ -60,3 +57,11 @@ linters-settings:
6057
- G402
6158
# G601: Implicit memory aliasing in for loop.
6259
- G601
60+
issues:
61+
exclude:
62+
# We are leaving io/ioutil for now to make backports easier
63+
# https://github.com/argoproj/argo-workflows/pull/6964#issuecomment-946827019
64+
- "SA1019: \"io/ioutil\" has been deprecated since Go 1.16"
65+
exclude-rules:
66+
- path: server/artifacts/artifact_server_test.go
67+
text: "response body must be closed"

.spelling

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ k8s-jobs
148148
kube
149149
kubelet
150150
kubernetes
151+
liveness
151152
localhost
152153
memoization
153154
memoized

CHANGELOG.md

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

3+
## v3.4.0 (2022-09-18)
4+
5+
* [047952afd](https://github.com/argoproj/argo-workflows/commit/047952afd539d06cae2fd6ba0b608b19c1194bba) fix: SDK workflow file
6+
* [97328f1ed](https://github.com/argoproj/argo-workflows/commit/97328f1ed3885663b780f43e6b553208ecba4d3c) chore(deps): bump classnames and @types/classnames in /ui (#9603)
7+
* [2dac194a5](https://github.com/argoproj/argo-workflows/commit/2dac194a52acb46c5535e5f552fdf7fd520d0f4e) chore(deps-dev): bump @babel/core from 7.19.0 to 7.19.1 in /ui (#9602)
8+
* [47544cc02](https://github.com/argoproj/argo-workflows/commit/47544cc02a8663b5b69e4c213a382ff156deb63e) feat: Support retrying complex workflows with nested group nodes (#9499)
9+
* [30bd96b4c](https://github.com/argoproj/argo-workflows/commit/30bd96b4c030fb728a3da78e0045982bf778d554) fix: Error message if cronworkflow failed to update (#9583)
10+
* [fc5e11cd3](https://github.com/argoproj/argo-workflows/commit/fc5e11cd37f51e36517f7699c23afabac4f08528) chore(deps-dev): bump webpack-dev-server from 4.10.1 to 4.11.0 in /ui (#9567)
11+
* [ace179804](https://github.com/argoproj/argo-workflows/commit/ace179804996edc0d356bff257a980e60b9bc5a0) docs(dev-container): Fix buildkit doc for local dev (#9580)
12+
13+
### Contributors
14+
15+
* JM
16+
* Saravanan Balasubramanian
17+
* Yuan Tang
18+
* dependabot[bot]
19+
320
## v3.4.0-rc4 (2022-09-10)
421

522
* [dee4ea5b0](https://github.com/argoproj/argo-workflows/commit/dee4ea5b0be2408e13af7745db910d0130e578f2) chore(deps-dev): bump @babel/core from 7.18.13 to 7.19.0 in /ui (#9566)

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,13 @@ $(GOPATH)/bin/goimports:
299299
go install golang.org/x/tools/cmd/[email protected]
300300

301301
/usr/local/bin/clang-format:
302+
ifeq (, $(shell which clang-format))
302303
ifeq ($(shell uname),Darwin)
303304
brew install clang-format
304305
else
305306
sudo apt-get install clang-format
306307
endif
308+
endif
307309

308310
pkg/apis/workflow/v1alpha1/generated.proto: $(GOPATH)/bin/go-to-protobuf $(PROTO_BINARIES) $(TYPES) $(GOPATH)/src/github.com/gogo/protobuf
309311
# These files are generated on a v3/ folder by the tool. Link them to the root folder
@@ -393,7 +395,7 @@ dist/manifests/%: manifests/%
393395
# lint/test/etc
394396

395397
$(GOPATH)/bin/golangci-lint:
396-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.47.1
398+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.49.0
397399

398400
.PHONY: lint
399401
lint: server/static/files.go $(GOPATH)/bin/golangci-lint
@@ -421,6 +423,9 @@ test: server/static/files.go
421423
.PHONY: install
422424
install: githooks
423425
kubectl get ns $(KUBE_NAMESPACE) || kubectl create ns $(KUBE_NAMESPACE)
426+
# install cert-manager if Certificate CRD is not available
427+
kubectl get ns cert-manager || kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.9.1/cert-manager.yaml
428+
kubectl wait --for=condition=Ready pods --all --namespace cert-manager
424429
kubectl config set-context --current --namespace=$(KUBE_NAMESPACE)
425430
@echo "installing PROFILE=$(PROFILE)"
426431
kubectl kustomize --load-restrictor=LoadRestrictionsNone test/e2e/manifests/$(PROFILE) | sed 's|quay.io/argoproj/|$(IMAGE_NAMESPACE)/|' | sed 's/namespace: argo/namespace: $(KUBE_NAMESPACE)/' | kubectl -n $(KUBE_NAMESPACE) apply --prune -l app.kubernetes.io/part-of=argo -f -

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ The following commands install Argo Workflows as well as some commmonly used com
7070

7171
```bash
7272
kubectl create ns argo
73+
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.9.1/cert-manager.yaml
7374
kubectl apply -n argo -f https://raw.githubusercontent.com/argoproj/argo-workflows/master/manifests/quick-start-postgres.yaml
7475
```
7576

0 commit comments

Comments
 (0)