From a4c276e01218a0bed5d68bf933c8733650671d39 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 27 Sep 2023 02:35:23 +0000 Subject: [PATCH] upgrade to latest dependencies bumping google.golang.org/genproto/googleapis/rpc 2d3300f...e6e6cda: > e6e6cda chore(all): update all (# 1044) > c177e32 chore(deps): temporarily ignore grpc dep (# 1054) > 007df8e chore(all): auto-regenerate .pb.go files (# 1053) bumping google.golang.org/api c3d417d...d0ae30d: > d0ae30d chore(main): release 0.143.0 (# 2174) > bd12eba fix(docs): add an operation polling example (# 2186) > 26c6885 chore: give admins owners on renovate config (# 2185) > 3a58dbb chore: unfreeze grpc (# 2183) > 546196e chore(all): update all (# 2181) > 4c049c5 feat(all): auto-regenerate discovery clients (# 2182) > e61e11b feat(all): auto-regenerate discovery clients (# 2180) > 1bca7ee feat(all): auto-regenerate discovery clients (# 2179) > 00aa328 feat(all): auto-regenerate discovery clients (# 2177) > c6a8850 feat(all): auto-regenerate discovery clients (# 2176) > 68d92d4 feat(all): auto-regenerate discovery clients (# 2173) > fc96064 chore(main): release 0.142.0 (# 2162) > da71d0a feat(all): auto-regenerate discovery clients (# 2171) > ea1fe11 chore(all): update all to 007df8e (# 2167) > a8cadbf feat(all): use updated mtls config endpoint (# 2164) > 0c5c2d2 feat(all): auto-regenerate discovery clients (# 2168) > c4024ed feat(all): auto-regenerate discovery clients (# 2166) > 304fb51 feat(all): auto-regenerate discovery clients (# 2165) > a34ad77 feat(internal): add some feature flags for new auth libs (# 2163) > d6822ad feat(all): auto-regenerate discovery clients (# 2161) bumping knative.dev/serving 60cb95f...d0eaee0: > d0eaee0 Update net-certmanager nightly (# 14440) > 05273f8 Update net-contour nightly (# 14438) > de6d567 upgrade to latest dependencies (# 14437) > f9139ec fix: Bump our min K8s version to v1.26 add k8s 1.28 testing (# 14385) > 9e7956f fix(activator): Correctly return noop value from probePodIPs based on changes (# 14347) > 4182374 upgrade to latest dependencies (# 14434) > f9ff817 Update net-gateway-api nightly (# 14433) > aa881ac Update net-contour nightly (# 14431) > 3736ab5 Change the cert manager version # 14386 (# 14426) > 1724133 Update net-kourier nightly (# 14430) > b44525f Update net-istio nightly (# 14432) > 6168393 Update net-certmanager nightly (# 14417) > 2336b08 Update net-kourier nightly (# 14419) bumping google.golang.org/genproto f966b18...007df8e: > 007df8e chore(all): auto-regenerate .pb.go files (# 1053) > 2d3300f chore(all): update actions/checkout action to v4 (# 1052) > b8732ec chore(all): auto-regenerate .pb.go files (# 1051) > ccc8af3 chore(all): auto-regenerate .pb.go files (# 1050) > 6bfd019 chore(all): auto-regenerate .pb.go files (# 1047) > ca7cfce fix(analytics/admin/v1alpha): remove broken aliases (# 1045) > 1744710 chore(all): update all (# 1043) bumping google.golang.org/grpc 62726d4...c0aa20a: > c0aa20a Change version to 1.58.2 (# 6654) > 67a53a6 balancer/weightedroundrobin: fix ticker leak on update (# 6655) > 863de73 update version to 1.58.2-dev (# 6633) bumping knative.dev/eventing b704ab1...f10a44d: > f10a44d Add helpers to work with service accounts for OIDC (# 7278) > b898cf4 Add audience field for Subscriber and Reply to `SubscriberSpec` and `SubscriptionStatusPhysicalSubscription` (# 7296) > f191461 [main] Upgrade to latest dependencies (# 7297) > 641417a Moved new trigger filters tests to rekt from experimental (# 7243) > d6483cd Fixed logic to choose whether to use filter or filters for a trigger (# 7286) bumping knative.dev/hack 34850cd...f2f9b6f: > f2f9b6f Vendorless docs (# 324) > 46659bc Update actions (# 323) > 403114f Manual shellcheck (# 321) > 74aa02a :bug: Remove deps from go.mod for knative.dev/hack (# 320) bumping google.golang.org/genproto/googleapis/api f966b18...007df8e: > 007df8e chore(all): auto-regenerate .pb.go files (# 1053) > 2d3300f chore(all): update actions/checkout action to v4 (# 1052) > b8732ec chore(all): auto-regenerate .pb.go files (# 1051) > ccc8af3 chore(all): auto-regenerate .pb.go files (# 1050) > 6bfd019 chore(all): auto-regenerate .pb.go files (# 1047) > ca7cfce fix(analytics/admin/v1alpha): remove broken aliases (# 1045) > 1744710 chore(all): update all (# 1043) bumping knative.dev/networking 65a08ef...88e91e3: > 88e91e3 upgrade to latest dependencies (# 867) > a5e8fb9 Update community files (# 865) bumping knative.dev/pkg 559de7e...0f52db7: > 0f52db7 Bump google.golang.org/api from 0.142.0 to 0.143.0 (# 2840) > bd49c73 upgrade to latest dependencies (# 2839) > 51a826d Bump google.golang.org/grpc from 1.58.1 to 1.58.2 (# 2835) > 4930930 Bump google.golang.org/api from 0.141.0 to 0.142.0 (# 2834) > 0efc1bc Also return Audience in URIResolver.AddressableFromDestinationV1() (# 2836) Signed-off-by: Knative Automation --- go.mod | 20 +++++----- go.sum | 40 +++++++++---------- vendor/google.golang.org/grpc/version.go | 2 +- .../pkg/apis/duck/v1/subscribable_types.go | 6 +++ .../pkg/apis/duck/v1/zz_generated.deepcopy.go | 10 +++++ .../apis/messaging/v1/subscription_types.go | 10 +++++ .../messaging/v1/zz_generated.deepcopy.go | 10 +++++ vendor/knative.dev/hack/README.md | 31 +++++++++----- vendor/knative.dev/hack/embed.go | 4 +- .../pkg/resolver/addressable_resolver.go | 24 +++++++---- vendor/modules.txt | 20 +++++----- 11 files changed, 117 insertions(+), 60 deletions(-) diff --git a/go.mod b/go.mod index 42b823fe8..1d27d7b7e 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( k8s.io/api v0.26.5 k8s.io/apimachinery v0.26.5 k8s.io/client-go v0.26.5 - knative.dev/eventing v0.38.1-0.20230922165944-b704ab14b1a3 - knative.dev/hack v0.0.0-20230922134855-34850cddd60a - knative.dev/pkg v0.0.0-20230922135952-559de7ee8c67 - knative.dev/serving v0.38.1-0.20230922153311-60cb95fb4cbf + knative.dev/eventing v0.38.1-0.20230926144029-f10a44d7475e + knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263 + knative.dev/pkg v0.0.0-20230926133247-0f52db700d63 + knative.dev/serving v0.38.1-0.20230926134156-d0eaee098ffe ) require ( @@ -87,12 +87,12 @@ require ( golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.13.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/api v0.141.0 // indirect + google.golang.org/api v0.143.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect - google.golang.org/grpc v1.58.1 // indirect + google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect + google.golang.org/grpc v1.58.2 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -103,7 +103,7 @@ require ( k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect - knative.dev/networking v0.0.0-20230922121936-65a08ef1061d // indirect + knative.dev/networking v0.0.0-20230922144027-88e91e3034e9 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/go.sum b/go.sum index c745c573b..485d1b7ae 100644 --- a/go.sum +++ b/go.sum @@ -581,8 +581,8 @@ google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.141.0 h1:Df6vfMgDoIM6ss0m7H4MPwFwY87WNXHfBIda/Bmfl4E= -google.golang.org/api v0.141.0/go.mod h1:iZqLkdPlXKyG0b90eu6KxVSE4D/ccRF2e/doKD2CnQQ= +google.golang.org/api v0.143.0 h1:o8cekTkqhywkbZT6p1UHJPZ9+9uuCAJs/KYomxZB8fA= +google.golang.org/api v0.143.0/go.mod h1:FoX9DO9hT7DLNn97OuoZAGSDuNAXdJRuGK98rSUgurk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -623,12 +623,12 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= -google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= -google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 h1:o4LtQxebKIJ4vkzyhtD2rfUNZ20Zf0ik5YVP5E7G7VE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -646,8 +646,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -714,16 +714,16 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.38.1-0.20230922165944-b704ab14b1a3 h1:Qk8mZ0rAd+maJLfJaz3ZmqwobcAu8ozI2nhMhjnOIgU= -knative.dev/eventing v0.38.1-0.20230922165944-b704ab14b1a3/go.mod h1:QWSxmyJ8QdmhEyy8hzu0qgS69fcTTFlSPB9Ntmwvycw= -knative.dev/hack v0.0.0-20230922134855-34850cddd60a h1:49UQAWesCa31hlEr+hJV1olDlK+ZhyYwI+KEFTgC8K8= -knative.dev/hack v0.0.0-20230922134855-34850cddd60a/go.mod h1:WA6zi0u24QTDuFZUeqBwSerEh4Io8lxe6UmvolOzA24= -knative.dev/networking v0.0.0-20230922121936-65a08ef1061d h1:nt+V0z6SvwzCM5SOguA7iumZk2k7ZCmnn/wVlu8zNWk= -knative.dev/networking v0.0.0-20230922121936-65a08ef1061d/go.mod h1:UHJXYVVXazzsITAV5dW6tMFG/vaeM5MCXKFHYtuVX/8= -knative.dev/pkg v0.0.0-20230922135952-559de7ee8c67 h1:LHO+jjpemTbXV17poNbhpPTWi6vkBiZv0GtJw3Yj9FE= -knative.dev/pkg v0.0.0-20230922135952-559de7ee8c67/go.mod h1:HagK8mQdSVdmm2xSYMpl4iCLjhxPoPJdY1/NuuEvAVw= -knative.dev/serving v0.38.1-0.20230922153311-60cb95fb4cbf h1:SyoI5+ehqDbCLWN2GyBcmeVvQ/OmrwqTxgISYRI1fi4= -knative.dev/serving v0.38.1-0.20230922153311-60cb95fb4cbf/go.mod h1:zfxLvDBkj4mr6ipBJy5EIhDLfy2/UZ7v2GGOygEtpjw= +knative.dev/eventing v0.38.1-0.20230926144029-f10a44d7475e h1:mGiuYm1j0nUP+283YpPq/q9MVC9o5rYf9GSSa/4hLwE= +knative.dev/eventing v0.38.1-0.20230926144029-f10a44d7475e/go.mod h1:ipgsk9oVS+bLJJMaX7CEnCsNFIcO1UcZvF6cZxMsqWE= +knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263 h1:e6r9J1YopzSh6tDCpyKhVBfRUlZ2r0KRo9wupRjdRF4= +knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/networking v0.0.0-20230922144027-88e91e3034e9 h1:o7ChTaWJF1GuvS6TuJfAs/0qVilqeZt6jh4wuOrv2bA= +knative.dev/networking v0.0.0-20230922144027-88e91e3034e9/go.mod h1:zNe2sZyoLV3FkMZRwPQ5XgJqi5k76Zdat0VFK4SAu0M= +knative.dev/pkg v0.0.0-20230926133247-0f52db700d63 h1:L0O5LRuKFkdwuR+MrDLGjrXgaQv9+7xse+kC7EboshI= +knative.dev/pkg v0.0.0-20230926133247-0f52db700d63/go.mod h1:NzXHwtuwTWXyMD1KbL2ONwLk8cLROLYTtujCTTG7xQs= +knative.dev/serving v0.38.1-0.20230926134156-d0eaee098ffe h1:K3AiQuVeVhAN0v1nVjGax5dT8C5Y19Fho3SOD9crEKM= +knative.dev/serving v0.38.1-0.20230926134156-d0eaee098ffe/go.mod h1:RA3oRr/HE1jpMhugk+XKqI3t7lzrdLFbMUgpG6QVTLE= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go index 2a910c3ce..d3f5bcbfc 100644 --- a/vendor/google.golang.org/grpc/version.go +++ b/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.58.1" +const Version = "1.58.2" diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1/subscribable_types.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1/subscribable_types.go index 4d95248ff..9464c857f 100644 --- a/vendor/knative.dev/eventing/pkg/apis/duck/v1/subscribable_types.go +++ b/vendor/knative.dev/eventing/pkg/apis/duck/v1/subscribable_types.go @@ -47,6 +47,9 @@ type SubscriberSpec struct { // subscriberUri // +optional SubscriberCACerts *string `json:"subscriberCACerts,omitempty"` + // SubscriberAudience is the OIDC audience for the subscriberUri. + // +optional + SubscriberAudience *string `json:"subscriberAudience,omitempty"` // ReplyURI is the endpoint for the reply // +optional ReplyURI *apis.URL `json:"replyUri,omitempty"` @@ -55,6 +58,9 @@ type SubscriberSpec struct { // replyUri. // +optional ReplyCACerts *string `json:"replyCACerts,omitempty"` + // ReplyAudience is the OIDC audience for the replyUri. + // +optional + ReplyAudience *string `json:"replyAudience,omitempty"` // +optional // DeliverySpec contains options controlling the event delivery // +optional diff --git a/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go index 5dd4986c7..8448a41de 100644 --- a/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/duck/v1/zz_generated.deepcopy.go @@ -320,6 +320,11 @@ func (in *SubscriberSpec) DeepCopyInto(out *SubscriberSpec) { *out = new(string) **out = **in } + if in.SubscriberAudience != nil { + in, out := &in.SubscriberAudience, &out.SubscriberAudience + *out = new(string) + **out = **in + } if in.ReplyURI != nil { in, out := &in.ReplyURI, &out.ReplyURI *out = new(apis.URL) @@ -330,6 +335,11 @@ func (in *SubscriberSpec) DeepCopyInto(out *SubscriberSpec) { *out = new(string) **out = **in } + if in.ReplyAudience != nil { + in, out := &in.ReplyAudience, &out.ReplyAudience + *out = new(string) + **out = **in + } if in.Delivery != nil { in, out := &in.Delivery, &out.Delivery *out = new(DeliverySpec) diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_types.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_types.go index 8f1c8e108..affea2b2d 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_types.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/subscription_types.go @@ -129,6 +129,11 @@ type SubscriptionStatusPhysicalSubscription struct { // +optional SubscriberCACerts *string `json:"subscriberCACerts,omitempty"` + // SubscriberAudience is the OIDC audience for the the resolved URI for + // spec.subscriber. + // +optional + SubscriberAudience *string `json:"subscriberAudience,omitempty"` + // ReplyURI is the fully resolved URI for the spec.reply. // +optional ReplyURI *apis.URL `json:"replyUri,omitempty"` @@ -139,6 +144,11 @@ type SubscriptionStatusPhysicalSubscription struct { // +optional ReplyCACerts *string `json:"replyCACerts,omitempty"` + // ReplyAudience is the OIDC audience for the the resolved URI for + // spec.reply. + // +optional + ReplyAudience *string `json:"replyAudience,omitempty"` + // DeliveryStatus contains a resolved URL to the dead letter sink address, and any other // resolved delivery options. eventingduckv1.DeliveryStatus `json:",inline"` diff --git a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go index a400fd2e3..e3a52d1b8 100644 --- a/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go +++ b/vendor/knative.dev/eventing/pkg/apis/messaging/v1/zz_generated.deepcopy.go @@ -382,6 +382,11 @@ func (in *SubscriptionStatusPhysicalSubscription) DeepCopyInto(out *Subscription *out = new(string) **out = **in } + if in.SubscriberAudience != nil { + in, out := &in.SubscriberAudience, &out.SubscriberAudience + *out = new(string) + **out = **in + } if in.ReplyURI != nil { in, out := &in.ReplyURI, &out.ReplyURI *out = new(apis.URL) @@ -392,6 +397,11 @@ func (in *SubscriptionStatusPhysicalSubscription) DeepCopyInto(out *Subscription *out = new(string) **out = **in } + if in.ReplyAudience != nil { + in, out := &in.ReplyAudience, &out.ReplyAudience + *out = new(string) + **out = **in + } in.DeliveryStatus.DeepCopyInto(&out.DeliveryStatus) return } diff --git a/vendor/knative.dev/hack/README.md b/vendor/knative.dev/hack/README.md index 5dc34c8ed..8799e0b59 100644 --- a/vendor/knative.dev/hack/README.md +++ b/vendor/knative.dev/hack/README.md @@ -7,13 +7,16 @@ entrypoint functionality. This is a helper script to run the presubmit tests. To use it: -1. Source this script. +1. Source this script: + ```bash + source "$(go run knative.dev/hack/cmd/script presubmit-tests.sh)" + ``` 1. [optional] Define the function `build_tests()`. If you don't define this function, the default action for running the build tests is to: - run `go build` on the entire repo - - run `/hack/verify-codegen.sh` (if it exists) + - run `hack/verify-codegen.sh` (if it exists) - check licenses in all go packages 1. [optional] Customize the default build test runner, if you're using it. Set @@ -70,7 +73,7 @@ skipped. ### Sample presubmit test script ```bash -source vendor/knative.dev/hack/presubmit-tests.sh +source "$(go run knative.dev/hack/cmd/script presubmit-tests.sh)" function post_build_tests() { echo "Cleaning up after build tests" @@ -99,7 +102,10 @@ This is a helper script for Knative E2E test scripts. To use it: [here](https://github.com/knative/toolbox/blob/main/kntest/pkg/kubetest2/gke/README.md) to the `initialize` function call if the default values don't fit your needs. -1. Source the script. +1. Source the script: + ```bash + source "$(go run knative.dev/hack/cmd/script e2e-tests.sh)" + ``` 1. [optional] Write the `knative_setup()` function, which will set up your system under test (e.g., Knative Serving). @@ -166,8 +172,7 @@ for Knative Serving to be up before running the tests. It also requires that the test cluster is created in a specific region, `us-west2`. ```bash - -source vendor/knative.dev/hack/e2e-tests.sh +source "$(go run knative.dev/hack/cmd/script e2e-tests.sh)" function knative_setup() { start_latest_knative_serving @@ -201,7 +206,10 @@ This is a helper script for Knative performance test scripts. In combination with specific Prow jobs, it can automatically manage the environment for running benchmarking jobs for each repo. To use it: -1. Source the script. +1. Source the script: + ```bash + source "$(go run knative.dev/hack/cmd/script performance-tests.sh)" + ``` 1. [optional] Customize GCP project settings for the benchmarks. Set the following environment variables if the default value doesn't fit your needs: @@ -238,7 +246,7 @@ benchmarking jobs for each repo. To use it: This script will update `Knative serving` and the given benchmark. ```bash -source vendor/knative.dev/hack/performance-tests.sh +source "$(go run knative.dev/hack/cmd/script performance-tests.sh)" function update_knative() { echo ">> Updating serving" @@ -257,7 +265,10 @@ main $@ This is a helper script for Knative release scripts. To use it: -1. Source the script. +1. Source the script: + ```bash + source "$(go run knative.dev/hack/cmd/script release.sh)" + ``` 1. [optional] By default, the release script will run `./test/presubmit-tests.sh` as the release validation tests. If you need to @@ -313,7 +324,7 @@ This is a helper script for Knative release scripts. To use it: ### Sample release script ```bash -source vendor/knative.dev/hack/release.sh +source "$(go run knative.dev/hack/cmd/script release.sh)" function build_release() { # config/ contains the manifests diff --git a/vendor/knative.dev/hack/embed.go b/vendor/knative.dev/hack/embed.go index 4e39c21a3..62f856ec6 100644 --- a/vendor/knative.dev/hack/embed.go +++ b/vendor/knative.dev/hack/embed.go @@ -16,7 +16,9 @@ limitations under the License. package hack -import "embed" +import ( + "embed" +) //go:embed *.sh var Scripts embed.FS diff --git a/vendor/knative.dev/pkg/resolver/addressable_resolver.go b/vendor/knative.dev/pkg/resolver/addressable_resolver.go index c53a13d39..bbbcb78b6 100644 --- a/vendor/knative.dev/pkg/resolver/addressable_resolver.go +++ b/vendor/knative.dev/pkg/resolver/addressable_resolver.go @@ -163,8 +163,9 @@ func (r *URIResolver) AddressableFromDestinationV1(ctx context.Context, dest duc return nil, fmt.Errorf("URI is not absolute (both scheme and host should be non-empty): %q", dest.URI.String()) } return &duckv1.Addressable{ - URL: dest.URI, - CACerts: dest.CACerts, + URL: dest.URI, + CACerts: dest.CACerts, + Audience: dest.Audience, }, nil } @@ -188,9 +189,10 @@ func (r *URIResolver) addressableFromDestinationRef(ctx context.Context, dest du handled, url, err := resolver(ctx, or) if handled { return &duckv1.Addressable{ - Name: dest.Ref.Address, - URL: url, - CACerts: dest.CACerts, + Name: dest.Ref.Address, + URL: url, + CACerts: dest.CACerts, + Audience: dest.Audience, }, err } @@ -229,9 +231,10 @@ func (r *URIResolver) addressableFromDestinationRef(ctx context.Context, dest du url.Scheme = "https" } return &duckv1.Addressable{ - Name: dest.Ref.Address, - URL: url, - CACerts: dest.CACerts, + Name: dest.Ref.Address, + URL: url, + CACerts: dest.CACerts, + Audience: dest.Audience, }, nil } @@ -258,6 +261,11 @@ func (r *URIResolver) addressableFromDestinationRef(ctx context.Context, dest du addr.CACerts = dest.CACerts } + if dest.Audience != nil && *dest.Audience != "" { + // destinations audience takes preference + addr.Audience = dest.Audience + } + return addr, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 3cfc55634..5f3ab8d3c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -345,7 +345,7 @@ golang.org/x/tools/internal/typeparams # gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 -# google.golang.org/api v0.141.0 +# google.golang.org/api v0.143.0 ## explicit; go 1.19 google.golang.org/api/support/bundler # google.golang.org/appengine v1.6.7 @@ -357,16 +357,16 @@ google.golang.org/appengine/internal/log google.golang.org/appengine/internal/remote_api google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/urlfetch -# google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 +# google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb ## explicit; go 1.19 google.golang.org/genproto/protobuf/field_mask -# google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 +# google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb ## explicit; go 1.19 google.golang.org/genproto/googleapis/api/httpbody -# google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 +# google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 ## explicit; go 1.19 google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.58.1 +# google.golang.org/grpc v1.58.2 ## explicit; go 1.19 google.golang.org/grpc google.golang.org/grpc/attributes @@ -957,7 +957,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.38.1-0.20230922165944-b704ab14b1a3 +# knative.dev/eventing v0.38.1-0.20230926144029-f10a44d7475e ## explicit; go 1.19 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/test @@ -1004,15 +1004,15 @@ knative.dev/eventing/pkg/metrics knative.dev/eventing/pkg/metrics/source knative.dev/eventing/pkg/observability knative.dev/eventing/pkg/observability/client -# knative.dev/hack v0.0.0-20230922134855-34850cddd60a +# knative.dev/hack v0.0.0-20230926181829-f2f9b6f91263 ## explicit; go 1.18 knative.dev/hack -# knative.dev/networking v0.0.0-20230922121936-65a08ef1061d +# knative.dev/networking v0.0.0-20230922144027-88e91e3034e9 ## explicit; go 1.18 knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/config -# knative.dev/pkg v0.0.0-20230922135952-559de7ee8c67 +# knative.dev/pkg v0.0.0-20230926133247-0f52db700d63 ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1076,7 +1076,7 @@ knative.dev/pkg/webhook/psbinding knative.dev/pkg/webhook/resourcesemantics knative.dev/pkg/webhook/resourcesemantics/defaulting knative.dev/pkg/webhook/resourcesemantics/validation -# knative.dev/serving v0.38.1-0.20230922153311-60cb95fb4cbf +# knative.dev/serving v0.38.1-0.20230926134156-d0eaee098ffe ## explicit; go 1.18 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1