Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
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 knative.dev/hack 34850cd...46659bc:
  > 46659bc Update actions (# 323)
  > 403114f Manual shellcheck (# 321)
  > 74aa02a 🐛 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/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)
bumping knative.dev/eventing b704ab1...b898cf4:
  > 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 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 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 knative.dev/serving 60cb95f...05273f8:
  > 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/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/networking 65a08ef...88e91e3:
  > 88e91e3 upgrade to latest dependencies (# 867)
  > a5e8fb9 Update community files (# 865)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Sep 26, 2023
1 parent 2839986 commit a95e102
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 50 deletions.
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.20230926065408-b898cf45c5c5
knative.dev/hack v0.0.0-20230926013247-46659bcc46aa
knative.dev/pkg v0.0.0-20230926133247-0f52db700d63
knative.dev/serving v0.38.1-0.20230926124232-05273f896fb4
)

require (
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
40 changes: 20 additions & 20 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand All @@ -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=
Expand Down Expand Up @@ -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.20230926065408-b898cf45c5c5 h1:MpTe/DzDLiIVxW5NjgTDemJcMvWPptFL72LKZkC8dRM=
knative.dev/eventing v0.38.1-0.20230926065408-b898cf45c5c5/go.mod h1:ipgsk9oVS+bLJJMaX7CEnCsNFIcO1UcZvF6cZxMsqWE=
knative.dev/hack v0.0.0-20230926013247-46659bcc46aa h1:P5wVR7my+I+hifzjJX8MWKGqhsd2vcjziaqxmggkK3g=
knative.dev/hack v0.0.0-20230926013247-46659bcc46aa/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.20230926124232-05273f896fb4 h1:c1j8NpdgFVEg727Op8fDx/suSGLI2A18DNCnuXqFcvE=
knative.dev/serving v0.38.1-0.20230926124232-05273f896fb4/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=
Expand Down
2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/version.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand All @@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand All @@ -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"`
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion vendor/knative.dev/hack/embed.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ limitations under the License.

package hack

import "embed"
import (
"embed"
)

//go:embed *.sh
var Scripts embed.FS
24 changes: 16 additions & 8 deletions vendor/knative.dev/pkg/resolver/addressable_resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down Expand Up @@ -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
}

Expand All @@ -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
}

Expand Down
20 changes: 10 additions & 10 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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.20230926065408-b898cf45c5c5
## explicit; go 1.19
knative.dev/eventing/pkg/adapter/v2
knative.dev/eventing/pkg/adapter/v2/test
Expand Down Expand Up @@ -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-20230926013247-46659bcc46aa
## 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
Expand Down Expand Up @@ -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.20230926124232-05273f896fb4
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit a95e102

Please sign in to comment.