Skip to content

Commit caf3747

Browse files
committed
Merge remote-tracking branch 'upstream/main' into handover/magetasks
Conflicts fixed: - .editorconfig - go.work - go.work.sum
2 parents 2a1c131 + 9c3eea8 commit caf3747

File tree

9,270 files changed

+1212
-3963254
lines changed

Some content is hidden

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

9,270 files changed

+1212
-3963254
lines changed

Diff for: .github/workflows/knative-boilerplate.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242

4343
steps:
4444

45-
- name: Set up Go 1.17.x
45+
- name: Set up Go 1.21.x
4646
uses: actions/setup-go@v2
4747
with:
48-
go-version: 1.17.x
48+
go-version: 1.21.x
4949
id: go
5050

5151
- name: Check out code

Diff for: .github/workflows/knative-go-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ on:
1111

1212
jobs:
1313
build:
14-
uses: knative/actions/.github/workflows/go-build.yaml@main
14+
uses: knative/actions/.github/workflows/reusable-go-build.yaml@main

Diff for: .github/workflows/knative-go-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ on:
1414

1515
jobs:
1616
test:
17-
uses: knative/actions/.github/workflows/go-test.yaml@main
17+
uses: knative/actions/.github/workflows/reusable-go-test.yaml@main

Diff for: .github/workflows/knative-security.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ on:
1414

1515
jobs:
1616
analyze:
17-
uses: knative/actions/.github/workflows/security.yaml@main
17+
uses: knative/actions/.github/workflows/reusable-security.yaml@main

Diff for: .github/workflows/knative-stale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ on:
1111
jobs:
1212

1313
stale:
14-
uses: knative/actions/.github/workflows/stale.yaml@main
14+
uses: knative/actions/.github/workflows/reusable-stale.yaml@main

Diff for: .github/workflows/knative-style.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212
jobs:
1313

1414
style:
15-
uses: knative/actions/.github/workflows/style.yaml@main
15+
uses: knative/actions/.github/workflows/reusable-style.yaml@main

Diff for: .github/workflows/knative-verify.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ on:
2323

2424
jobs:
2525
verify:
26-
uses: knative/actions/.github/workflows/verify-codegen.yaml@main
26+
uses: knative/actions/.github/workflows/reusable-verify-codegen.yaml@main

Diff for: README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ testing of Knative.
1111
## Contributing
1212

1313
If you are interested in contributing, see [CONTRIBUTING.md](./CONTRIBUTING.md)
14-
and [DEVELOPMENT.md](./DEVELOPMENT.md).
14+
and [DEVELOPMENT.md](./DEVELOPMENT.md). For a list of help wanted issues across
15+
Knative, take a look at [CLOTRIBUTOR](https://clotributor.dev/search?project=knative&page=1)

Diff for: SECURITY.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Knative Security Policy
2+
3+
We're extremely grateful for security researchers and users that report vulnerabilities to the Knative Open Source Community. All reports are thoroughly investigated by a set of community volunteers.
4+
5+
To make a report, please email the private [email protected] list with the security details and the details expected for all Knative bug reports.
6+
7+
See [Knative Security and Disclosure Information](https://knative.dev/docs/reference/security/) for more details.

Diff for: flaky-test-reporter/config/config.yaml

-35
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,13 @@ jobConfigs:
4242
slackChannels:
4343
- name: knative-serving-bots
4444
identity: C04MYJBP3H7
45-
- name: s390x-contour-tests_serving_main_periodic
46-
org: knative
47-
repo: serving
48-
type: postsubmit
49-
slackChannels:
50-
- name: knative-serving-bots
51-
identity: C04MYJBP3H7
5245
- name: kourier-stable_serving_main_periodic
5346
org: knative
5447
repo: serving
5548
type: postsubmit
5649
slackChannels:
5750
- name: knative-serving-bots
5851
identity: C04MYJBP3H7
59-
- name: s390x-kourier-tests_serving_main_periodic
60-
org: knative
61-
repo: serving
62-
type: postsubmit
63-
slackChannels:
64-
- name: knative-serving-bots
65-
identity: C04MYJBP3H7
6652
- name: continuous_eventing_main_periodic
6753
org: knative
6854
repo: eventing
@@ -71,29 +57,8 @@ jobConfigs:
7157
slackChannels:
7258
- name: knative-eventing
7359
identity: C04LMU33V1S
74-
- name: s390x-e2e-tests_eventing_main_periodic
75-
org: knative
76-
repo: eventing
77-
type: postsubmit
78-
slackChannels:
79-
- name: knative-eventing
80-
identity: C04LMU33V1S
8160
- name: continuous_eventing-kafka-broker_main_periodic
8261
org: knative-extensions
8362
repo: eventing-kafka-broker
8463
type: postsubmit
8564
issueRepo: eventing-kafka-broker
86-
- name: s390x-e2e-tests_operator_main_periodic
87-
org: knative
88-
repo: operator
89-
type: postsubmit
90-
slackChannels:
91-
- name: knative-eventing
92-
identity: C04LMU33V1S
93-
- name: s390x-e2e-tests_client_main_periodic
94-
org: knative
95-
repo: client
96-
type: postsubmit
97-
slackChannels:
98-
- name: knative-client
99-
identity: C04LY4SKBQR

Diff for: flaky-test-reporter/github_issue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const (
5656
<summary>%s</summary><p>
5757
5858
%s
59-
</p></details>` // The blank line is crucial for collapsible format
59+
</p></details>` // The blank line is crucial for collapsible format
6060

6161
// issueBodyTemplate is a template for issue body
6262
issueBodyTemplate = `

Diff for: go.mod

+78-58
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,116 @@
11
module knative.dev/toolbox
22

3-
go 1.18
3+
go 1.21
44

55
require (
6-
cloud.google.com/go/storage v1.22.1
6+
cloud.google.com/go/storage v1.39.1
77
github.com/blang/semver/v4 v4.0.0
8-
github.com/davecgh/go-spew v1.1.1
8+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
99
github.com/go-git/go-git-fixtures/v4 v4.2.1
1010
github.com/go-git/go-git/v5 v5.4.2
11-
github.com/go-sql-driver/mysql v1.5.0
12-
github.com/google/go-cmp v0.5.8
13-
github.com/google/go-containerregistry v0.8.1-0.20220216220642-00c59d91847c
11+
github.com/go-sql-driver/mysql v1.7.1
12+
github.com/google/go-cmp v0.6.0
13+
github.com/google/go-containerregistry v0.19.1
1414
github.com/google/go-github/v32 v32.1.1-0.20201004213705-76c3c3d7c6e7 // HEAD as of Nov 6
1515
github.com/hashicorp/errwrap v1.1.0 // indirect
1616
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
1717
github.com/kelseyhightower/envconfig v1.4.0
1818
github.com/pkg/errors v0.9.1
19-
github.com/spf13/cobra v1.5.0
20-
github.com/stretchr/testify v1.7.0
19+
github.com/spf13/cobra v1.8.0
20+
github.com/stretchr/testify v1.9.0
2121
github.com/wavesoftware/go-commandline v1.0.0
22-
go.uber.org/atomic v1.9.0
23-
go.uber.org/zap v1.19.1
24-
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9
25-
golang.org/x/net v0.0.0-20220607020251-c690dde0001d
26-
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
27-
google.golang.org/api v0.83.0
28-
k8s.io/apimachinery v0.24.3
29-
knative.dev/hack v0.0.0-20230317131237-3b8ef01d7c4f
22+
go.uber.org/atomic v1.10.0
23+
go.uber.org/zap v1.27.0
24+
golang.org/x/mod v0.16.0
25+
golang.org/x/net v0.22.0
26+
golang.org/x/oauth2 v0.18.0
27+
google.golang.org/api v0.171.0
28+
k8s.io/apimachinery v0.29.3
29+
knative.dev/hack v0.0.0-20240404013450-1133b37da8d7
3030
sigs.k8s.io/boskos v0.0.0-20230301234717-8b694e7dafa2
31-
sigs.k8s.io/yaml v1.3.0
31+
sigs.k8s.io/yaml v1.4.0
3232
)
3333

3434
require github.com/spf13/pflag v1.0.5
3535

3636
require (
37-
cloud.google.com/go v0.102.0 // indirect
38-
cloud.google.com/go/compute v1.6.1 // indirect
39-
cloud.google.com/go/iam v0.3.0 // indirect
40-
github.com/Microsoft/go-winio v0.5.1 // indirect
41-
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
37+
cloud.google.com/go v0.112.1 // indirect
38+
cloud.google.com/go/compute v1.25.1 // indirect
39+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
40+
cloud.google.com/go/iam v1.1.6 // indirect
41+
github.com/Microsoft/go-winio v0.6.1 // indirect
42+
github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
4243
github.com/acomagu/bufpipe v1.0.3 // indirect
44+
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
4345
github.com/beorn7/perks v1.0.1 // indirect
44-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
45-
github.com/docker/cli v20.10.12+incompatible // indirect
46-
github.com/docker/distribution v2.7.1+incompatible // indirect
47-
github.com/docker/docker v20.10.12+incompatible // indirect
48-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
46+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
47+
github.com/cloudflare/circl v1.3.7 // indirect
48+
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
49+
github.com/docker/cli v25.0.4+incompatible // indirect
50+
github.com/docker/distribution v2.8.3+incompatible // indirect
51+
github.com/docker/docker v25.0.4+incompatible // indirect
52+
github.com/docker/docker-credential-helpers v0.8.1 // indirect
4953
github.com/emirpasic/gods v1.12.0 // indirect
54+
github.com/felixge/httpsnoop v1.0.4 // indirect
5055
github.com/go-git/gcfg v1.5.0 // indirect
5156
github.com/go-git/go-billy/v5 v5.3.1 // indirect
57+
github.com/go-logr/logr v1.4.1 // indirect
58+
github.com/go-logr/stdr v1.2.2 // indirect
5259
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
53-
github.com/golang/protobuf v1.5.2 // indirect
60+
github.com/golang/protobuf v1.5.4 // indirect
5461
github.com/google/go-querystring v1.1.0 // indirect
55-
github.com/google/uuid v1.3.0 // indirect
56-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
57-
github.com/googleapis/go-type-adapters v1.0.0 // indirect
62+
github.com/google/s2a-go v0.1.7 // indirect
63+
github.com/google/uuid v1.6.0 // indirect
64+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
65+
github.com/googleapis/gax-go/v2 v2.12.3 // indirect
5866
github.com/hashicorp/go-multierror v1.1.1 // indirect
59-
github.com/imdario/mergo v0.3.12 // indirect
60-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
67+
github.com/imdario/mergo v0.3.16 // indirect
68+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6169
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
62-
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
63-
github.com/kr/pretty v0.2.1 // indirect
70+
github.com/kevinburke/ssh_config v1.1.0 // indirect
71+
github.com/klauspost/compress v1.17.7 // indirect
72+
github.com/kr/pretty v0.3.1 // indirect
6473
github.com/kr/text v0.2.0 // indirect
65-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
74+
github.com/matryer/is v1.4.0 // indirect
6675
github.com/mitchellh/go-homedir v1.1.0 // indirect
6776
github.com/opencontainers/go-digest v1.0.0 // indirect
68-
github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
69-
github.com/pmezard/go-difflib v1.0.0 // indirect
70-
github.com/prometheus/client_golang v1.12.1 // indirect
71-
github.com/prometheus/client_model v0.2.0 // indirect
72-
github.com/prometheus/common v0.32.1 // indirect
73-
github.com/prometheus/procfs v0.7.3 // indirect
74-
github.com/sergi/go-diff v1.1.0 // indirect
75-
github.com/sirupsen/logrus v1.9.0 // indirect
77+
github.com/opencontainers/image-spec v1.1.0 // indirect
78+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
79+
github.com/prometheus/client_golang v1.19.0 // indirect
80+
github.com/prometheus/client_model v0.6.0 // indirect
81+
github.com/prometheus/common v0.51.1 // indirect
82+
github.com/prometheus/procfs v0.12.0 // indirect
83+
github.com/rogpeppe/go-internal v1.11.0 // indirect
84+
github.com/sergi/go-diff v1.2.0 // indirect
85+
github.com/sirupsen/logrus v1.9.3 // indirect
86+
github.com/vbatts/tar-split v0.11.5 // indirect
7687
github.com/wavesoftware/go-retcode v1.0.0 // indirect
7788
github.com/xanzy/ssh-agent v0.3.0 // indirect
78-
go.opencensus.io v0.23.0 // indirect
79-
go.uber.org/multierr v1.7.0 // indirect
80-
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
81-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
82-
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
83-
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
84-
golang.org/x/text v0.3.7 // indirect
85-
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
86-
google.golang.org/appengine v1.6.7 // indirect
87-
google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac // indirect
88-
google.golang.org/grpc v1.47.0 // indirect
89-
google.golang.org/protobuf v1.28.0 // indirect
89+
go.opencensus.io v0.24.0 // indirect
90+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
91+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
92+
go.opentelemetry.io/otel v1.24.0 // indirect
93+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
94+
go.opentelemetry.io/otel/sdk v1.24.0 // indirect
95+
go.opentelemetry.io/otel/trace v1.24.0 // indirect
96+
go.uber.org/multierr v1.11.0 // indirect
97+
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
98+
golang.org/x/crypto v0.21.0 // indirect
99+
golang.org/x/sync v0.6.0 // indirect
100+
golang.org/x/sys v0.18.0 // indirect
101+
golang.org/x/text v0.14.0 // indirect
102+
golang.org/x/time v0.5.0 // indirect
103+
golang.org/x/tools v0.19.0 // indirect
104+
google.golang.org/appengine v1.6.8 // indirect
105+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
106+
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
107+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
108+
google.golang.org/grpc v1.62.1 // indirect
109+
google.golang.org/protobuf v1.33.0 // indirect
90110
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
91111
gopkg.in/warnings.v0 v0.1.2 // indirect
92-
gopkg.in/yaml.v2 v2.4.0 // indirect
93112
gopkg.in/yaml.v3 v3.0.1 // indirect
113+
gotest.tools/v3 v3.5.1 // indirect
94114
k8s.io/test-infra v0.0.0-20220913174101-46ac1a6cf806 // indirect
95-
k8s.io/utils v0.0.0-20220725171434-9bab9ef40391 // indirect
115+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
96116
)

0 commit comments

Comments
 (0)