Skip to content

Commit 74e1203

Browse files
kim-codefreshJoibelgcp-cherry-pick-bot[bot]tico24rogpeppe
authored
feat: sync release 3.6 to upstream 3.6.7 for small changes and vulnerabilities fixes (Cr 28355) (#358)
* fix: bump deps for k8schain to fix ecr-login (argoproj#14008) (release-3.6 cherry-pick) (argoproj#14174) * fix(ci): python sdk release process (release-3.6) (argoproj#14183) Signed-off-by: Alan Clucas <alan@clucas.org> * docs: clarify qps/burst on controller (cherry-pick argoproj#14190) (argoproj#14192) Signed-off-by: Tim Collins <tim@thecollins.team> Co-authored-by: Tim Collins <45351296+tico24@users.noreply.github.com> * fix(api/jsonschema): use unchanging JSON Schema version (cherry-pick argoproj#14092) (argoproj#14256) Signed-off-by: Roger Peppe <rogpeppe@gmail.com> Co-authored-by: Roger Peppe <rogpeppe@gmail.com> * fix(api/jsonschema): use working `$id` (cherry-pick argoproj#14257) (argoproj#14258) Signed-off-by: Roger Peppe <rogpeppe@gmail.com> Co-authored-by: Roger Peppe <rogpeppe@gmail.com> * docs: autogenerate tested k8s versions and centralize config (argoproj#14176) (release-3.6) (argoproj#14262) Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> Signed-off-by: Alan Clucas <alan@clucas.org> Co-authored-by: Mason Malone <651224+MasonM@users.noreply.github.com> * chore(deps): bump minio-go to newer version (argoproj#14185) (release-3.6) (argoproj#14261) Co-authored-by: Vaibhav Kaushik <vaibhavkaushik@salesforce.com> * fix: split pod controller from workflow controller (argoproj#14129) (release-3.6) (argoproj#14263) * chore(deps): fix snyk (argoproj#14264) (release-3.6) (argoproj#14268) * chore: revert to correct k8s versions Accidental bump from argoproj#14176 cherry-pick Signed-off-by: Alan Clucas <alan@clucas.org> * chore(deps): bump github.com/go-jose/go-jose/v3 from 3.0.3 to 3.0.4 in the go_modules group (cherry-pick argoproj#14231) (argoproj#14269) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: wait for workflow informer to sync before pod informer (cherry-pick argoproj#14248) (argoproj#14266) Signed-off-by: Rohan K <rohankmr414@gmail.com> Co-authored-by: Rohan K <rohankmr414@gmail.com> * fix(cli): remove red from log colour selection. Fixes argoproj#6740 (cherry-pick argoproj#14215) (argoproj#14278) Signed-off-by: Prabakaran Kumaresshan <4676330+nixphix@users.noreply.github.com> Co-authored-by: Prabakaran Kumaresshan <4676330+nixphix@users.noreply.github.com> * fix: correct semaphore configmap keys for multiple semaphores (argoproj#14184) (release-3.6) (argoproj#14281) * fix: don't print help for non-validation errors. Fixes argoproj#14234 (cherry-pick argoproj#14249) (argoproj#14283) Signed-off-by: Koichi Shimada <jumpe1programming@gmail.com> Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> Co-authored-by: koichi <51446844+jumpe1@users.noreply.github.com> Co-authored-by: Mason Malone <651224+MasonM@users.noreply.github.com> * docs: fix kubernetes versions (release-3.6) (argoproj#14273) Signed-off-by: Alan Clucas <alan@clucas.org> * fix(workflow/sync): use RWMutex to prevent concurrent map access (cherry-pick argoproj#14321) (argoproj#14322) Signed-off-by: Ryan Currah <ryan@currah.ca> Co-authored-by: Ryan Currah <ryan@currah.ca> * chore(lint): update golangci-lint to 2.1.1 (argoproj#14390) (cherry-pick release-3.6) (argoproj#14417) * chore: bump golang 1.23->1.24 (argoproj#14385) (cherry-pick release-3.6) (argoproj#14418) * fix: gracefully handle invalid CronWorkflows and simplify logic. (cherry-pick argoproj#14197) (argoproj#14419) Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> * fix: prevent dfs sorter infinite recursion on cycle. Fixes argoproj#13395 (cherry-pick argoproj#14391) (argoproj#14420) Signed-off-by: Adrien Delannoy <a.delannoyfr@gmail.com> Co-authored-by: Adrien Delannoy <a.delannoyfr@gmail.com> * chore(deps): bump github.com/expr-lang/expr from 1.16.9 to 1.17.0 (argoproj#14307) (release-3.6) (argoproj#14421) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps)!: update k8s and argo-events (release-3.6) (argoproj#14424) Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: william.vanhevelingen <william.vanhevelingen@acquia.com> Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> Signed-off-by: William Van Hevelingen <william.vanhevelingen@acquia.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: William Van Hevelingen <William.VanHevelingen@acquia.com> Co-authored-by: Mason Malone <651224+MasonM@users.noreply.github.com> * fix: correct retry logic (argoproj#13734) (release-3.6) (argoproj#14428) Signed-off-by: isubasinghe <isitha@pipekit.io> Signed-off-by: Alan Clucas <alan@clucas.org> Co-authored-by: Isitha Subasinghe <isitha@pipekit.io> * fix: manual retries exit handler cleanup. Fixes argoproj#14180 (argoproj#14181) (release-3.6) (argoproj#14429) Signed-off-by: isubasinghe <isitha@pipekit.io> Signed-off-by: Alan Clucas <alan@clucas.org> Co-authored-by: Isitha Subasinghe <isitha@pipekit.io> * fix: correct manual retry logic. Fixes argoproj#14124 (argoproj#14328) (release-3.6) (argoproj#14430) Signed-off-by: oninowang <oninowang@tencent.com> Signed-off-by: Alan Clucas <alan@clucas.org> Co-authored-by: jswxstw <jswxstw@gmail.com> * fix: disable ALPN in argo-server as a workaround (argoproj#14433) Signed-off-by: Alan Clucas <alan@clucas.org> * result of codegen Signed-off-by: Kim <kim.aharfi@codefresh.io> * fix:lint Signed-off-by: Kim <kim.aharfi@codefresh.io> --------- Signed-off-by: Alan Clucas <alan@clucas.org> Signed-off-by: Tim Collins <tim@thecollins.team> Signed-off-by: Roger Peppe <rogpeppe@gmail.com> Signed-off-by: Mason Malone <651224+MasonM@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Rohan K <rohankmr414@gmail.com> Signed-off-by: Prabakaran Kumaresshan <4676330+nixphix@users.noreply.github.com> Signed-off-by: Koichi Shimada <jumpe1programming@gmail.com> Signed-off-by: Ryan Currah <ryan@currah.ca> Signed-off-by: Adrien Delannoy <a.delannoyfr@gmail.com> Signed-off-by: william.vanhevelingen <william.vanhevelingen@acquia.com> Signed-off-by: William Van Hevelingen <william.vanhevelingen@acquia.com> Signed-off-by: isubasinghe <isitha@pipekit.io> Signed-off-by: oninowang <oninowang@tencent.com> Signed-off-by: Kim <kim.aharfi@codefresh.io> Co-authored-by: Alan Clucas <alan@clucas.org> Co-authored-by: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Co-authored-by: Tim Collins <45351296+tico24@users.noreply.github.com> Co-authored-by: Roger Peppe <rogpeppe@gmail.com> Co-authored-by: Mason Malone <651224+MasonM@users.noreply.github.com> Co-authored-by: Vaibhav Kaushik <vaibhavkaushik@salesforce.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rohan K <rohankmr414@gmail.com> Co-authored-by: Prabakaran Kumaresshan <4676330+nixphix@users.noreply.github.com> Co-authored-by: koichi <51446844+jumpe1@users.noreply.github.com> Co-authored-by: Ryan Currah <ryan@currah.ca> Co-authored-by: Adrien Delannoy <a.delannoyfr@gmail.com> Co-authored-by: William Van Hevelingen <William.VanHevelingen@acquia.com> Co-authored-by: Isitha Subasinghe <isitha@pipekit.io> Co-authored-by: jswxstw <jswxstw@gmail.com>
1 parent 5a63db5 commit 74e1203

File tree

665 files changed

+13240
-8131
lines changed

Some content is hidden

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

665 files changed

+13240
-8131
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"appPort": 8080,
44
"features": {
55
"ghcr.io/devcontainers/features/go:1": {
6-
"version": "1.23"
6+
"version": "1.24"
77
},
88
"ghcr.io/devcontainers/features/node:1": {
99
"version": "20"

‎.devcontainer/pre-build.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
#!/usr/bin/env sh
1+
#!/usr/bin/env bash
22
set -eux
33

4-
# install kubernetes
4+
# install kubernetes using the minimum tested version
5+
. hack/k8s-versions.sh
56
wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash
6-
k3d cluster get k3s-default || k3d cluster create --image rancher/k3s:v1.27.3-k3s1 --wait
7+
k3d cluster get k3s-default || k3d cluster create --image "rancher/k3s:${K8S_VERSIONS[min]}-k3s1" --wait
78
k3d kubeconfig merge --kubeconfig-merge-default
89

910
# install kubectl
10-
curl -LO https://dl.k8s.io/release/v1.27.3/bin/linux/$(go env GOARCH)/kubectl
11+
curl -LO "https://dl.k8s.io/release/${K8S_VERSIONS[min]}/bin/linux/$(go env GOARCH)/kubectl"
1112
chmod +x ./kubectl
1213
sudo mv ./kubectl /usr/local/bin/kubectl
1314
kubectl cluster-info
1415

1516
# install kit
16-
make kit
17+
curl -q https://raw.githubusercontent.com/kitproj/kit/main/install.sh | sh
1718

1819
# install protocol buffer compiler (protoc)
1920
sudo apt update

‎.github/workflows/ci-build.yaml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
130130
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
131131
with:
132-
go-version: "1.23"
132+
go-version: "1.24"
133133
cache: true
134134
- run: make test STATIC_FILES=false GOTEST='go test -p 20 -covermode=atomic -coverprofile=coverage.out'
135135
- name: Upload coverage report
@@ -151,7 +151,7 @@ jobs:
151151
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
152152
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
153153
with:
154-
go-version: "1.23"
154+
go-version: "1.24"
155155
cache: true
156156
# windows run does not use makefile target because it does a lot more than just testing and is not cross-platform compatible
157157
- run: go test -p 20 -covermode=atomic -coverprofile='coverage.out' $(go list ./... | select-string -Pattern 'github.com/argoproj/argo-workflows/v3/workflow/controller' , 'github.com/argoproj/argo-workflows/v3/server' -NotMatch)
@@ -242,15 +242,15 @@ jobs:
242242
profile: minimal
243243
use-api: true
244244
- test: test-executor
245-
install_k3s_version: v1.28.13+k3s1
245+
k8s_version: min
246246
profile: minimal
247247
use-api: false
248248
- test: test-corefunctional
249-
install_k3s_version: v1.28.13+k3s1
249+
k8s_version: min
250250
profile: minimal
251251
use-api: false
252252
- test: test-functional
253-
install_k3s_version: v1.28.13+k3s1
253+
k8s_version: min
254254
profile: minimal
255255
use-api: false
256256
steps:
@@ -267,7 +267,7 @@ jobs:
267267
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
268268
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
269269
with:
270-
go-version: "1.23"
270+
go-version: "1.24"
271271
cache: true
272272
- name: Install Java for the SDK
273273
if: ${{matrix.test == 'test-java-sdk'}}
@@ -283,12 +283,11 @@ jobs:
283283
python-version: '3.x'
284284
cache: pip
285285
- name: Install and start K3S
286+
env:
287+
K8S_VERSION: ${{ matrix.k8s_version || 'max' }}
286288
run: |
287-
if ! echo "${{ matrix.install_k3s_version }}" | egrep '^v[0-9]+\.[0-9]+\.[0-9]+\+k3s1$'; then
288-
export INSTALL_K3S_VERSION=v1.31.0+k3s1
289-
else
290-
export INSTALL_K3S_VERSION=${{ matrix.install_k3s_version }}
291-
fi
289+
. hack/k8s-versions.sh
290+
export INSTALL_K3S_VERSION="${K8S_VERSIONS[$K8S_VERSION]}+k3s1"
292291
293292
curl -sfL https://get.k3s.io | INSTALL_K3S_CHANNEL=stable \
294293
INSTALL_K3S_EXEC="--docker --kubelet-arg=config=${GITHUB_WORKSPACE}/test/e2e/manifests/kubelet-configuration.yaml" \
@@ -407,7 +406,7 @@ jobs:
407406
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
408407
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
409408
with:
410-
go-version: "1.23"
409+
go-version: "1.24"
411410
cache: true
412411
- name: Install protoc
413412
run: |
@@ -444,7 +443,7 @@ jobs:
444443
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
445444
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
446445
with:
447-
go-version: "1.23"
446+
go-version: "1.24"
448447
cache: true
449448
- run: make lint STATIC_FILES=false
450449
# if lint makes changes that are not in the PR, fail the build

‎.github/workflows/docs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
python-version: 3.9
3838
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3939
with:
40-
go-version: '1.23'
40+
go-version: "1.24"
4141
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
4242
with:
4343
node-version: "19"

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
node-version: "20" # change in all GH Workflows
246246
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
247247
with:
248-
go-version: "1.23"
248+
go-version: "1.24"
249249
- name: Restore node packages cache
250250
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
251251
with:

‎.golangci.yml‎

Lines changed: 66 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# https://golangci-lint.run/usage/quick-start/
1+
version: "2"
22
run:
3-
timeout: 12m
43
build-tags:
54
- api
65
- cli
@@ -17,13 +16,7 @@ linters:
1716
- bodyclose
1817
- copyloopvar
1918
- errcheck
20-
- goimports
21-
# only minor issues
22-
# - errorlint
23-
# seems to have bugs in recent version, also slow
24-
# - gci
2519
- gosec
26-
- gosimple
2720
- govet
2821
- ineffassign
2922
- misspell
@@ -34,36 +27,70 @@ linters:
3427
- sqlclosecheck
3528
- staticcheck
3629
- testifylint
37-
- typecheck
3830
- unparam
3931
- unused
40-
linters-settings:
41-
goimports:
42-
local-prefixes: github.com/argoproj/argo-workflows/
43-
gosec:
44-
includes:
45-
- G304
46-
- G307
47-
excludes:
48-
# G106: Use of ssh InsecureIgnoreHostKey should be audited
49-
- G106
50-
# G402: TLS InsecureSkipVerify set true
51-
- G402
52-
# G601: Implicit memory aliasing in for loop.
53-
- G601
54-
issues:
55-
exclude-rules:
56-
- path: server/artifacts/artifact_server_test.go
57-
text: "response body must be closed"
58-
exclude-dirs:
59-
- dist
60-
- docs
61-
- examples
62-
- hack
63-
- manifests
64-
- pkg/client
65-
- sdks
66-
- ui
67-
- vendor
68-
exclude-files:
69-
- server/static/files.go
32+
settings:
33+
gosec:
34+
includes:
35+
- G304
36+
- G307
37+
excludes:
38+
# G106: Use of ssh InsecureIgnoreHostKey should be audited
39+
- G106
40+
# G402: TLS InsecureSkipVerify set true
41+
- G402
42+
staticcheck:
43+
checks:
44+
- all
45+
# Capitalised variable names
46+
- "-ST1003"
47+
# Capitalised error strings
48+
- "-ST1005"
49+
# Receiver names
50+
- "-ST1016"
51+
exclusions:
52+
generated: lax
53+
presets:
54+
- comments
55+
- common-false-positives
56+
- legacy
57+
- std-error-handling
58+
rules:
59+
- path: server/artifacts/artifact_server_test.go
60+
text: response body must be closed
61+
paths:
62+
- dist
63+
- docs
64+
- examples
65+
- hack
66+
- manifests
67+
- pkg/client
68+
- sdks
69+
- ui
70+
- vendor
71+
- third_party$
72+
- builtin$
73+
- examples$
74+
formatters:
75+
enable:
76+
- gofmt
77+
- goimports
78+
settings:
79+
goimports:
80+
local-prefixes:
81+
- github.com/argoproj/argo-workflows/
82+
exclusions:
83+
generated: lax
84+
paths:
85+
- dist
86+
- docs
87+
- examples
88+
- hack
89+
- manifests
90+
- pkg/client
91+
- sdks
92+
- ui
93+
- vendor
94+
- third_party$
95+
- builtin$
96+
- examples$

‎.spelling‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ liveness
183183
localhost
184184
maxFailures
185185
maxSuccess
186+
md
186187
memoization
187188
memoized
188189
memoizing
@@ -200,6 +201,7 @@ parameterizing
200201
params
201202
pprof
202203
pre-commit
204+
qps
203205
rc2
204206
repo
205207
roadmap

‎Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG GIT_COMMIT=unknown
33
ARG GIT_TAG=unknown
44
ARG GIT_TREE_STATE=unknown
55

6-
FROM golang:1.23-alpine3.19 as builder
6+
FROM golang:1.24-alpine3.21 as builder
77

88
# libc-dev to build openapi-gen
99
RUN apk update && apk add --no-cache \
@@ -109,6 +109,8 @@ USER 8737
109109

110110
WORKDIR /home/argo
111111

112+
# Temporary workaround for https://github.com/grpc/grpc-go/issues/434
113+
ENV GRPC_ENFORCE_ALPN_ENABLED=false
112114
COPY hack/ssh_known_hosts /etc/ssh/
113115
COPY hack/nsswitch.conf /etc/
114116
COPY --from=argocli-build /go/src/github.com/argoproj/argo-workflows/dist/argo /bin/

‎Dockerfile.windows‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG GIT_TREE_STATE=unknown
1111

1212
# had issues with official golange image for windows so I'm using plain servercore
1313
FROM mcr.microsoft.com/windows/servercore:${IMAGE_OS_VERSION} as builder
14-
ENV GOLANG_VERSION=1.23
14+
ENV GOLANG_VERSION=1.24
1515
SHELL ["powershell", "-Command"]
1616

1717
# install chocolatey package manager

‎Makefile‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,12 +298,12 @@ swagger: \
298298
$(GOPATH)/bin/mockery: Makefile
299299
# update this in Nix when upgrading it here
300300
ifneq ($(USE_NIX), true)
301-
go install github.com/vektra/mockery/v2@v2.42.2
301+
go install github.com/vektra/mockery/v2@v2.53.3
302302
endif
303303
$(GOPATH)/bin/controller-gen: Makefile
304304
# update this in Nix when upgrading it here
305305
ifneq ($(USE_NIX), true)
306-
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0
306+
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2
307307
endif
308308
$(GOPATH)/bin/go-to-protobuf: Makefile
309309
# update this in Nix when upgrading it here
@@ -451,7 +451,7 @@ dist/manifests/%: manifests/%
451451
# lint/test/etc
452452

453453
$(GOPATH)/bin/golangci-lint: Makefile
454-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v1.61.0
454+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b `go env GOPATH`/bin v2.1.1
455455

456456
.PHONY: lint
457457
lint: server/static/files.go $(GOPATH)/bin/golangci-lint
@@ -658,7 +658,7 @@ dist/kubernetes.swagger.json: Makefile
658658
@mkdir -p dist
659659
# recurl will only fetch if the file doesn't exist, so delete it
660660
rm -f $@
661-
./hack/recurl.sh $@ https://raw.githubusercontent.com/kubernetes/kubernetes/v1.30.3/api/openapi-spec/swagger.json
661+
./hack/recurl.sh $@ https://raw.githubusercontent.com/kubernetes/kubernetes/v1.32.2/api/openapi-spec/swagger.json
662662

663663
pkg/apiclient/_.secondary.swagger.json: hack/api/swagger/secondaryswaggergen.go pkg/apis/workflow/v1alpha1/openapi_generated.go dist/kubernetes.swagger.json
664664
rm -Rf v3 vendor
@@ -712,7 +712,7 @@ endif
712712
.PHONY: docs-spellcheck
713713
docs-spellcheck: /usr/local/bin/mdspell
714714
# check docs for spelling mistakes
715-
mdspell --ignore-numbers --ignore-acronyms --en-us --no-suggestions --report $(shell find docs -name '*.md' -not -name upgrading.md -not -name README.md -not -name fields.md -not -name upgrading.md -not -name executor_swagger.md -not -path '*/cli/*')
715+
mdspell --ignore-numbers --ignore-acronyms --en-us --no-suggestions --report $(shell find docs -name '*.md' -not -name upgrading.md -not -name README.md -not -name fields.md -not -name upgrading.md -not -name executor_swagger.md -not -path '*/cli/*' -not -name tested-kubernetes-versions.md)
716716
# alphabetize spelling file -- ignore first line (comment), then sort the rest case-sensitive and remove duplicates
717717
$(shell cat .spelling | awk 'NR<2{ print $0; next } { print $0 | "LC_COLLATE=C sort" }' | uniq | tee .spelling > /dev/null)
718718

@@ -737,7 +737,7 @@ endif
737737
.PHONY: docs-lint
738738
docs-lint: /usr/local/bin/markdownlint
739739
# lint docs
740-
markdownlint docs --fix --ignore docs/fields.md --ignore docs/executor_swagger.md --ignore docs/cli --ignore docs/walk-through/the-structure-of-workflow-specs.md
740+
markdownlint docs --fix --ignore docs/fields.md --ignore docs/executor_swagger.md --ignore docs/cli --ignore docs/walk-through/the-structure-of-workflow-specs.md --ignore docs/tested-kubernetes-versions.md
741741

742742
/usr/local/bin/mkdocs:
743743
# update this in Nix when upgrading it here
@@ -756,6 +756,9 @@ docs: /usr/local/bin/mkdocs \
756756
# check environment-variables.md contains all variables mentioned in the code
757757
./hack/docs/check-env-doc.sh
758758
# build the docs
759+
ifeq ($(shell echo $(GIT_BRANCH) | head -c 8),release-)
760+
./hack/docs/tested-versions.sh > docs/tested-kubernetes-versions.md
761+
endif
759762
TZ=UTC mkdocs build --strict
760763
# tell the user the fastest way to edit docs
761764
@echo "ℹ️ If you want to preview your docs, open site/index.html. If you want to edit them with hot-reload, run 'make docs-serve' to start mkdocs on port 8000"

0 commit comments

Comments
 (0)