Skip to content

Commit f7d6596

Browse files
upgrade to latest dependencies (knative-extensions#1092)
bumping knative.dev/pkg 51be315...3c00bb0: > 3c00bb0 Update community files (# 2426) > fc93ac7 upgrade to latest dependencies (# 2424) bumping knative.dev/eventing f13248e...0326f92: > 0326f92 Update rotation (# 6129) bumping knative.dev/hack 7331bb1...b9cb198: > b9cb198 Update community files (# 151) > 0e30607 Update kntest path after knative/test-infra#3087 (# 150) bumping knative.dev/reconciler-test 6e47083...3f8092f: > 3f8092f Auto logging on teardown (# 293) > 1ba730c Add EventHub readiness probe only in receiver role (# 302) Signed-off-by: Knative Automation <automation@knative.team>
1 parent 59a3a1c commit f7d6596

File tree

9 files changed

+64
-21
lines changed

9 files changed

+64
-21
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ require (
3535
k8s.io/client-go v0.22.5
3636
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
3737
knative.dev/control-protocol v0.0.0-20220201152531-79a0b1ad34b9
38-
knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de
39-
knative.dev/hack v0.0.0-20220209225905-7331bb16ba00
40-
knative.dev/pkg v0.0.0-20220203020920-51be315ed160
41-
knative.dev/reconciler-test v0.0.0-20220202155955-6e47083645cf
38+
knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7
39+
knative.dev/hack v0.0.0-20220215185059-b9cb1983b600
40+
knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9
41+
knative.dev/reconciler-test v0.0.0-20220215020657-3f8092fb8739
4242
sigs.k8s.io/yaml v1.3.0
4343
)
4444

go.sum

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,21 +1344,22 @@ k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 h1:ZKMMxTvduyf5WUtREOqg5LiXaN1KO
13441344
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
13451345
knative.dev/control-protocol v0.0.0-20220201152531-79a0b1ad34b9 h1:9+OLxKuRiP87qlsvqrVDCLke+zvL6ryf17bL0rNVJKk=
13461346
knative.dev/control-protocol v0.0.0-20220201152531-79a0b1ad34b9/go.mod h1:OGZyr8rJQoDs8pE9gQ47koLdhJ+Vb0QubzntQbrwjdY=
1347-
knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de h1:Z0TnYRmUl+aM+m7l7yP2OqOW6xa3e04XDqDU/4r/ksI=
1348-
knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de/go.mod h1:jsc5u3aC+BYmfUR2cRz9jb77krfULStxXkR1EgMUWp0=
1347+
knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7 h1:Pfmd/rJoXCZbOvD2EIA9U+b8vL75SKVpXNlEkwMvd+4=
1348+
knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7/go.mod h1:jsc5u3aC+BYmfUR2cRz9jb77krfULStxXkR1EgMUWp0=
13491349
knative.dev/hack v0.0.0-20220118141833-9b2ed8471e30/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
13501350
knative.dev/hack v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
13511351
knative.dev/hack v0.0.0-20220201013531-82bfca153560/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
1352-
knative.dev/hack v0.0.0-20220209225905-7331bb16ba00 h1:MbdDq3JZoCoUzYbw/liB0Idklk/fE2bXiSQnIRhgeC4=
13531352
knative.dev/hack v0.0.0-20220209225905-7331bb16ba00/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
1353+
knative.dev/hack v0.0.0-20220215185059-b9cb1983b600 h1:xhXjwWz0LAmh/ptKqlFm+hklb39borBhrRegayybgK4=
1354+
knative.dev/hack v0.0.0-20220215185059-b9cb1983b600/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
13541355
knative.dev/hack/schema v0.0.0-20220128200847-51a42b2eb63e/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0=
13551356
knative.dev/pkg v0.0.0-20220118160532-77555ea48cd4/go.mod h1:etVT7Tm8pSDf4RKhGk4r7j/hj3dNBpvT7bO6a6wpahs=
13561357
knative.dev/pkg v0.0.0-20220131144930-f4b57aef0006/go.mod h1:bZMFTPDPHV3wXuiQ09UJuEGYYQnfpe81MCxNvsMAiJk=
1357-
knative.dev/pkg v0.0.0-20220203020920-51be315ed160 h1:usHculW2JbADkFNQS8LN3e+sQo2xdJfBaP6/XSvHxQ4=
1358-
knative.dev/pkg v0.0.0-20220203020920-51be315ed160/go.mod h1:bZMFTPDPHV3wXuiQ09UJuEGYYQnfpe81MCxNvsMAiJk=
1358+
knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9 h1:u0vYuNe0BTFvbqN8euaauL/kN3jR7mjmxMc+QRnWsUw=
1359+
knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9/go.mod h1:6ZoCgi60jSUn/WrwTGNAZbsz5/kmwiZZD8EovSLzYZ4=
13591360
knative.dev/reconciler-test v0.0.0-20220126171745-740e77ebaace/go.mod h1:XV4cghzCtdASkfUsfMYSnGfGRyd/naDjy9h7Tnae22g=
1360-
knative.dev/reconciler-test v0.0.0-20220202155955-6e47083645cf h1:CWm0NQaA69oT3ARuocoXHYSOP0fuML3dDbNFVSZ1J/c=
1361-
knative.dev/reconciler-test v0.0.0-20220202155955-6e47083645cf/go.mod h1:m2q6+mGqlPsJ6qP0ssMv3x2UBwIgTdTxgxJ6GK5kgu4=
1361+
knative.dev/reconciler-test v0.0.0-20220215020657-3f8092fb8739 h1:9bexnbVV6wsAv3thvosv9wX7wuZ7M3gUSOzhekMcz4E=
1362+
knative.dev/reconciler-test v0.0.0-20220215020657-3f8092fb8739/go.mod h1:m2q6+mGqlPsJ6qP0ssMv3x2UBwIgTdTxgxJ6GK5kgu4=
13621363
pgregory.net/rapid v0.3.3 h1:jCjBsY4ln4Atz78QoBWxUEvAHaFyNDQg9+WU62aCn1U=
13631364
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
13641365
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

vendor/knative.dev/hack/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ main "$@"
111111
This is a helper script for Knative E2E test scripts. To use it:
112112

113113
1. [optional] Customize the test cluster. Pass the flags as described
114-
[here](../kntest/pkg/kubetest2/gke/README.md) to the `initialize` function
114+
[here](../tools/kntest/pkg/kubetest2/gke/README.md) to the `initialize` function
115115
call if the default values don't fit your needs.
116116

117117
1. Source the script.

vendor/knative.dev/hack/library.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ function go_mod_gopath_hack() {
695695
# Parameters: $1..$n - parameters passed to the tool.
696696
function run_kntest() {
697697
if [[ ! -x "$(command -v kntest)" ]]; then
698-
echo "--- FAIL: kntest not installed, please clone knative test-infra repo and run \`go install ./kntest/cmd/kntest\` to install it"; return 1;
698+
echo "--- FAIL: kntest not installed, please clone knative test-infra repo and run \`go install ./tools/kntest/cmd/kntest\` to install it"; return 1;
699699
fi
700700
kntest "$@"
701701
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
Copyright 2020 The Knative Authors
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
package environment
18+
19+
import (
20+
"knative.dev/reconciler-test/pkg/feature"
21+
)
22+
23+
// loggingSteps returns a number of steps that logs environment-managed resources.
24+
func (mr *MagicEnvironment) loggingSteps() []feature.Step {
25+
return []feature.Step{{
26+
Name: "Log references",
27+
S: feature.Any,
28+
L: feature.Must,
29+
T: feature.Teardown,
30+
Fn: feature.LogReferences(mr.refs...),
31+
}}
32+
}

vendor/knative.dev/reconciler-test/pkg/environment/magic.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,11 @@ func (mr *MagicEnvironment) Test(ctx context.Context, originalT *testing.T, f *f
294294
// TODO implement fail fast feature to avoid proceeding with testing if an "expected level" assert fails here
295295
}
296296

297+
if originalT.Failed() {
298+
// Prepend logging steps to the teardown phase.
299+
steps[feature.Teardown] = append(mr.loggingSteps(), steps[feature.Teardown]...)
300+
}
301+
297302
for _, s := range steps[feature.Teardown] {
298303
s := s
299304

vendor/knative.dev/reconciler-test/pkg/eventshub/103-pod.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ spec:
2626
- name: eventshub
2727
image: {{ .image }}
2828
imagePullPolicy: "IfNotPresent"
29+
{{ if .withReadiness }}
2930
readinessProbe:
3031
httpGet:
3132
port: 8080
3233
path: /health/ready
34+
{{ end }}
3335
env:
3436
- name: "SYSTEM_NAMESPACE"
3537
valueFrom:

vendor/knative.dev/reconciler-test/pkg/eventshub/resources.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ func Install(name string, options ...EventsHubOption) feature.StepFn {
6767
// Install ServiceAccount, Role, RoleBinding
6868
eventshubrbac.Install()(ctx, t)
6969

70+
isReceiver := strings.Contains(envs["EVENT_GENERATORS"], "receiver")
71+
7072
// Deploy
7173
if _, err := manifest.InstallYamlFS(ctx, templates, map[string]interface{}{
72-
"name": name,
73-
"envs": envs,
74-
"image": ImageFromContext(ctx),
74+
"name": name,
75+
"envs": envs,
76+
"image": ImageFromContext(ctx),
77+
"withReadiness": isReceiver,
7578
}); err != nil {
7679
t.Fatal(err)
7780
}
@@ -80,7 +83,7 @@ func Install(name string, options ...EventsHubOption) feature.StepFn {
8083
k8s.WaitForReadyOrDoneOrFail(ctx, t, k8s.PodReference(namespace, name))
8184

8285
// If the eventhubs starts an event receiver, we need to wait for the service endpoint to be synced
83-
if strings.Contains(envs["EVENT_GENERATORS"], "receiver") {
86+
if isReceiver {
8487
k8s.WaitForServiceEndpointsOrFail(ctx, t, name, 1)
8588
k8s.WaitForServiceReadyOrFail(ctx, t, name, "/health/ready")
8689
}

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ knative.dev/control-protocol/pkg/message
12031203
knative.dev/control-protocol/pkg/network
12041204
knative.dev/control-protocol/pkg/reconciler
12051205
knative.dev/control-protocol/pkg/service
1206-
# knative.dev/eventing v0.29.1-0.20220209143041-f13248e5a7de
1206+
# knative.dev/eventing v0.29.1-0.20220214155047-0326f92dd5b7
12071207
## explicit
12081208
knative.dev/eventing/pkg/adapter/v2
12091209
knative.dev/eventing/pkg/adapter/v2/test
@@ -1343,11 +1343,11 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher
13431343
knative.dev/eventing/test/upgrade/prober/wathola/forwarder
13441344
knative.dev/eventing/test/upgrade/prober/wathola/receiver
13451345
knative.dev/eventing/test/upgrade/prober/wathola/sender
1346-
# knative.dev/hack v0.0.0-20220209225905-7331bb16ba00
1346+
# knative.dev/hack v0.0.0-20220215185059-b9cb1983b600
13471347
## explicit
13481348
knative.dev/hack
13491349
knative.dev/hack/shell
1350-
# knative.dev/pkg v0.0.0-20220203020920-51be315ed160
1350+
# knative.dev/pkg v0.0.0-20220215153400-3c00bb0157b9
13511351
## explicit
13521352
knative.dev/pkg/apiextensions/storageversion
13531353
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1455,7 +1455,7 @@ knative.dev/pkg/webhook/resourcesemantics
14551455
knative.dev/pkg/webhook/resourcesemantics/conversion
14561456
knative.dev/pkg/webhook/resourcesemantics/defaulting
14571457
knative.dev/pkg/webhook/resourcesemantics/validation
1458-
# knative.dev/reconciler-test v0.0.0-20220202155955-6e47083645cf
1458+
# knative.dev/reconciler-test v0.0.0-20220215020657-3f8092fb8739
14591459
## explicit
14601460
knative.dev/reconciler-test/cmd/eventshub
14611461
knative.dev/reconciler-test/pkg/environment

0 commit comments

Comments
 (0)