From 81f6e8c9f20ba034462f1bcb6c76a3fcb6363f44 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 12 Sep 2023 11:28:09 +0100 Subject: [PATCH] upgrade to latest dependencies (#1558) bumping knative.dev/hack 760813a...3af329f: > 3af329f Update community files (# 313) bumping knative.dev/caching 4283c94...f182792: > f182792 Update community files (# 782) bumping knative.dev/serving a8a8be2...997d8ef: > 997d8ef fix(activator): Don't cancel all probes on one probe failure (# 14303) > 6567552 Remove AUTHORS file (# 14350) > 4ab6bd7 Update community files (# 14349) bumping knative.dev/eventing b082850...74baa8f: > 74baa8f [main] Update community files (# 7246) > 94dfb4a Expose a Brokers audience in its status (# 7237) > 7876f12 Add Audience field in CRDs (# 7244) bumping knative.dev/pkg 27252a3...09df2b6: > 09df2b6 Update community files (# 2817) > 6550b1f Bump actions/checkout from 3 to 4 (# 2811) Signed-off-by: Knative Automation --- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- .../pkg/apis/eventing/v1/broker_lifecycle.go | 10 ++++------ .../pkg/apis/eventing/v1/test_helper.go | 8 ++++++-- .../pkg/reconciler/testing/v1/broker.go | 12 +++++------ vendor/knative.dev/serving/AUTHORS | 11 ---------- vendor/modules.txt | 10 +++++----- 7 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 vendor/knative.dev/serving/AUTHORS diff --git a/go.mod b/go.mod index 3c7d35ccb9..3d4de01f38 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/client-go v0.26.5 k8s.io/code-generator v0.26.5 k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 - knative.dev/caching v0.0.0-20230907115913-4283c94087e3 - knative.dev/eventing v0.38.1-0.20230907060413-b08285068489 - knative.dev/hack v0.0.0-20230906172513-760813ad2706 - knative.dev/pkg v0.0.0-20230905144417-27252a376b30 - knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3 + knative.dev/caching v0.0.0-20230911131321-f18279268e0e + knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d + knative.dev/hack v0.0.0-20230911131120-3af329f73ff3 + knative.dev/pkg v0.0.0-20230911130819-09df2b681efd + knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 3b0ca44923..504b095d31 100644 --- a/go.sum +++ b/go.sum @@ -1397,18 +1397,18 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/caching v0.0.0-20230907115913-4283c94087e3 h1:2KvFrxqP6PwEjZwkEXg7/Gukb4klh/34foli34ded/w= -knative.dev/caching v0.0.0-20230907115913-4283c94087e3/go.mod h1:zBNGNn1uvHCpDqOxJbqs2qyn+RUYikCXlQAegkGpjqk= -knative.dev/eventing v0.38.1-0.20230907060413-b08285068489 h1:XTeecv4cC1XnmTCHhAXqcGyIJf69jdQNFZ8Nh//xR5s= -knative.dev/eventing v0.38.1-0.20230907060413-b08285068489/go.mod h1:V81fCtozZsKFXTLix6y0BXEguzUo+FCcJGzNfjL7JHc= -knative.dev/hack v0.0.0-20230906172513-760813ad2706 h1:5/b4gPIUUNqVFkDKO9AMnEkdUvZrFVqf+z3r5rJ9w/U= -knative.dev/hack v0.0.0-20230906172513-760813ad2706/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8= +knative.dev/caching v0.0.0-20230911131321-f18279268e0e h1:OZ5V5zyUKOUUdabuQ6FO6Cxz400VgZ9D/0ORyucqm3c= +knative.dev/caching v0.0.0-20230911131321-f18279268e0e/go.mod h1:zBNGNn1uvHCpDqOxJbqs2qyn+RUYikCXlQAegkGpjqk= +knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d h1:JOWFfjNkEqxWtgvTyGGrXuuE1vK3+tOk9JpgbuHYX/0= +knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d/go.mod h1:V81fCtozZsKFXTLix6y0BXEguzUo+FCcJGzNfjL7JHc= +knative.dev/hack v0.0.0-20230911131120-3af329f73ff3 h1:3vOdwAi/IjOTQvL2nP3RDRgPuYIbSRqEgaIgAgDFC08= +knative.dev/hack v0.0.0-20230911131120-3af329f73ff3/go.mod h1:dx0YG3YWqJu653e9tjcT0Q1ZdS9JJXLKbUhzr4EB0g8= knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a h1:xiF0cQfHuo0qBoaSeXjyk+56Cu1gYv0ezu6qMx9E8us= knative.dev/networking v0.0.0-20230906132213-17b4f7b1ea4a/go.mod h1:nXiCx9KmJ5WgDofa8zOXA5poIQe8GeBL/neZtQyfobg= -knative.dev/pkg v0.0.0-20230905144417-27252a376b30 h1:q8OCYCux80XnBIscEUTyK9kMAM5cYhPMXlU0b77maz0= -knative.dev/pkg v0.0.0-20230905144417-27252a376b30/go.mod h1:KOCW7iby+PL0aSDG2Ta7Vf1kCn+VAqL7QaTyK0c4fuk= -knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3 h1:g1rzQl9jQvRhP935giIa8rSrx+SDxo9xiRK2W9Q/hEI= -knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3/go.mod h1:v3lJx+0X60fxa+0yu6DY94ez1qbf6bt1vp7iXglHipU= +knative.dev/pkg v0.0.0-20230911130819-09df2b681efd h1:p73TV5lMulQpFpa7FBMSGORaL9MFzENu+IVhMv/ELMs= +knative.dev/pkg v0.0.0-20230911130819-09df2b681efd/go.mod h1:KOCW7iby+PL0aSDG2Ta7Vf1kCn+VAqL7QaTyK0c4fuk= +knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d h1:QiE3llHJVKeUi/R79jfobuH5h4vNAzerW/u4s4XEq30= +knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d/go.mod h1:v3lJx+0X60fxa+0yu6DY94ez1qbf6bt1vp7iXglHipU= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go index ebe569271e..9bc846e89e 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/broker_lifecycle.go @@ -74,16 +74,14 @@ func (bs *BrokerStatus) GetTopLevelCondition() *apis.Condition { // SetAddress makes this Broker addressable by setting the URI. It also // sets the BrokerConditionAddressable to true. -func (bs *BrokerStatus) SetAddress(url *apis.URL) { +func (bs *BrokerStatus) SetAddress(address *v1.Addressable) { bs.AddressStatus = v1.AddressStatus{ - Address: &v1.Addressable{ - URL: url, - }, + Address: address, } - if url != nil { + if address != nil && address.URL != nil { bs.GetConditionSet().Manage(bs).MarkTrue(BrokerConditionAddressable) - bs.AddressStatus.Address.Name = &url.Scheme + bs.AddressStatus.Address.Name = &address.URL.Scheme } else { bs.GetConditionSet().Manage(bs).MarkFalse(BrokerConditionAddressable, "nil URL", "URL is nil") } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go index 80b2510009..31c2c51c87 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1/test_helper.go @@ -61,7 +61,9 @@ func (t testHelper) ReadyBrokerStatus() *BrokerStatus { bs.PropagateIngressAvailability(t.AvailableEndpoints()) bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus()) bs.PropagateFilterAvailability(t.AvailableEndpoints()) - bs.SetAddress(apis.HTTP("example.com")) + bs.SetAddress(&duckv1.Addressable{ + URL: apis.HTTP("example.com"), + }) bs.MarkDeadLetterSinkResolvedSucceeded(eventingduckv1.DeliveryStatus{}) return bs } @@ -71,7 +73,9 @@ func (t testHelper) ReadyBrokerStatusWithoutDLS() *BrokerStatus { bs.PropagateIngressAvailability(t.AvailableEndpoints()) bs.PropagateTriggerChannelReadiness(t.ReadyChannelStatus()) bs.PropagateFilterAvailability(t.AvailableEndpoints()) - bs.SetAddress(apis.HTTP("example.com")) + bs.SetAddress(&duckv1.Addressable{ + URL: apis.HTTP("example.com"), + }) bs.MarkDeadLetterSinkNotConfigured() return bs } diff --git a/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/broker.go b/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/broker.go index 970b9abbd1..3ef470c251 100644 --- a/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/broker.go +++ b/vendor/knative.dev/eventing/pkg/reconciler/testing/v1/broker.go @@ -88,19 +88,19 @@ func WithBrokerConfig(config *duckv1.KReference) BrokerOption { } // WithBrokerAddress sets the Broker's address. -func WithBrokerAddress(address string) BrokerOption { +func WithBrokerAddress(address *duckv1.Addressable) BrokerOption { return func(b *v1.Broker) { - b.Status.SetAddress(&apis.URL{ - Scheme: "http", - Host: address, - }) + b.Status.SetAddress(address) } } // WithBrokerAddressURI sets the Broker's address as URI. func WithBrokerAddressURI(uri *apis.URL) BrokerOption { return func(b *v1.Broker) { - b.Status.SetAddress(uri) + b.Status.SetAddress(&duckv1.Addressable{ + Name: &uri.Scheme, + URL: uri, + }) } } diff --git a/vendor/knative.dev/serving/AUTHORS b/vendor/knative.dev/serving/AUTHORS deleted file mode 100644 index f42714c4ec..0000000000 --- a/vendor/knative.dev/serving/AUTHORS +++ /dev/null @@ -1,11 +0,0 @@ -# This is the list of Knative authors for copyright purposes. -# -# This does not necessarily list everyone who has contributed code, since in -# some cases, their employer may be the copyright holder. To see the full list -# of contributors, see the revision history in source control. -Google LLC -Pivotal Software, Inc. -IBM Corp -Red Hat, Inc. -Cisco Systems, Inc. -VMware, Inc. diff --git a/vendor/modules.txt b/vendor/modules.txt index 098536d67c..174b279be7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1256,11 +1256,11 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/caching v0.0.0-20230907115913-4283c94087e3 +# knative.dev/caching v0.0.0-20230911131321-f18279268e0e ## explicit; go 1.18 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 -# knative.dev/eventing v0.38.1-0.20230907060413-b08285068489 +# knative.dev/eventing v0.38.1-0.20230911130820-74baa8fdca9d ## explicit; go 1.19 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -1349,7 +1349,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/fetcher knative.dev/eventing/test/upgrade/prober/wathola/forwarder knative.dev/eventing/test/upgrade/prober/wathola/receiver knative.dev/eventing/test/upgrade/prober/wathola/sender -# knative.dev/hack v0.0.0-20230906172513-760813ad2706 +# knative.dev/hack v0.0.0-20230911131120-3af329f73ff3 ## explicit; go 1.18 knative.dev/hack knative.dev/hack/shell @@ -1368,7 +1368,7 @@ knative.dev/networking/pkg/http/probe knative.dev/networking/pkg/http/proxy knative.dev/networking/pkg/http/stats knative.dev/networking/pkg/k8s -# knative.dev/pkg v0.0.0-20230905144417-27252a376b30 +# knative.dev/pkg v0.0.0-20230911130819-09df2b681efd ## explicit; go 1.18 knative.dev/pkg/apiextensions/storageversion knative.dev/pkg/apiextensions/storageversion/cmd/migrate @@ -1448,7 +1448,7 @@ knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates knative.dev/pkg/webhook/certificates/resources knative.dev/pkg/webhook/resourcesemantics/conversion -# knative.dev/serving v0.38.1-0.20230908164815-a8a8be25a7e3 +# knative.dev/serving v0.38.1-0.20230912012518-997d8ef27e0d ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1