Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/serving 60cb95f...b44525f:
  > b44525f Update net-istio nightly (# 14432)
  > 6168393 Update net-certmanager nightly (# 14417)
  > 2336b08 Update net-kourier nightly (# 14419)
bumping knative.dev/pkg 559de7e...0efc1bc:
  > 0efc1bc Also return Audience in URIResolver.AddressableFromDestinationV1() (# 2836)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation committed Sep 25, 2023
1 parent 0c99a13 commit 9fce35f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ require (
knative.dev/caching v0.0.0-20230922143727-f45a005abea0
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/pkg v0.0.0-20230925085724-0efc1bce35a9
knative.dev/serving v0.38.1-0.20230925122845-b44525febed2
sigs.k8s.io/yaml v1.3.0
)

Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1394,10 +1394,10 @@ knative.dev/hack v0.0.0-20230922134855-34850cddd60a h1:49UQAWesCa31hlEr+hJV1olDl
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/pkg v0.0.0-20230925085724-0efc1bce35a9 h1:0GZJ6ZTAkS59goRuMVc5t9vNMmegbggrB/A7pTm2USE=
knative.dev/pkg v0.0.0-20230925085724-0efc1bce35a9/go.mod h1:HagK8mQdSVdmm2xSYMpl4iCLjhxPoPJdY1/NuuEvAVw=
knative.dev/serving v0.38.1-0.20230925122845-b44525febed2 h1:h8mQISNX3RG7KiRReqwNj6W0lb03B9KYvtFKMHvBITw=
knative.dev/serving v0.38.1-0.20230925122845-b44525febed2/go.mod h1:zfxLvDBkj4mr6ipBJy5EIhDLfy2/UZ7v2GGOygEtpjw=
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=
Expand Down
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
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,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-20230922135952-559de7ee8c67
# knative.dev/pkg v0.0.0-20230925085724-0efc1bce35a9
## explicit; go 1.18
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
Expand Down Expand Up @@ -1445,7 +1445,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.20230922153311-60cb95fb4cbf
# knative.dev/serving v0.38.1-0.20230925122845-b44525febed2
## explicit; go 1.18
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down

0 comments on commit 9fce35f

Please sign in to comment.