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/hack 34850cd...74aa02a:
  > 74aa02a 🐛 Remove deps from go.mod for knative.dev/hack (# 320)
bumping knative.dev/pkg 559de7e...0efc1bc:
  > 0efc1bc Also return Audience in URIResolver.AddressableFromDestinationV1() (# 2836)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
knative-automation committed Sep 25, 2023
1 parent 2839986 commit a12c0fe
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 21 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ require (
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/hack v0.0.0-20230925132200-74aa02a8beeb
knative.dev/pkg v0.0.0-20230925085724-0efc1bce35a9
knative.dev/serving v0.38.1-0.20230925122845-b44525febed2
)

require (
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -716,14 +716,14 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJ
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/hack v0.0.0-20230925132200-74aa02a8beeb h1:GYlj0vJBoye0mtCbgZddyMTXIzgSRihRruaCnCffBSI=
knative.dev/hack v0.0.0-20230925132200-74aa02a8beeb/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
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=
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
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
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
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-20230925132200-74aa02a8beeb
## explicit; go 1.18
knative.dev/hack
# knative.dev/networking v0.0.0-20230922121936-65a08ef1061d
## 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-20230925085724-0efc1bce35a9
## 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.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 a12c0fe

Please sign in to comment.