Skip to content

Commit

Permalink
upgrade to latest dependencies (knative#14434)
Browse files Browse the repository at this point in the history 
bumping knative.dev/networking 65a08ef...88e91e3:
  > 88e91e3 upgrade to latest dependencies (# 867)
  > a5e8fb9 Update community files (# 865)
bumping knative.dev/pkg 05a411a...0efc1bc:
  > 0efc1bc Also return Audience in URIResolver.AddressableFromDestinationV1() (# 2836)
  > 559de7e upgrade to latest dependencies (# 2833)
  > dd819c0 Update community files (# 2830)
bumping knative.dev/hack da6e74c...34850cd:
  > 34850cd Update community files (# 319)
bumping knative.dev/caching 7f3928f...f45a005:
  > f45a005 upgrade to latest dependencies (# 788)
  > 3d313f7 Update community files (# 786)

Signed-off-by: Knative Automation <automation@knative.team>
  • Loading branch information
@knative-automation
knative-automation authored Sep 25, 2023
1 parent f9ff817 commit 4182374
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 24 deletions.
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ require (
k8s.io/code-generator v0.26.5
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
knative.dev/caching v0.0.0-20230922121835-7f3928f2fc87
knative.dev/hack v0.0.0-20230922114927-da6e74ccb8e8
knative.dev/networking v0.0.0-20230922121936-65a08ef1061d
knative.dev/pkg v0.0.0-20230922122916-05a411a3e26f
knative.dev/caching v0.0.0-20230922143727-f45a005abea0
knative.dev/hack v0.0.0-20230922134855-34850cddd60a
knative.dev/networking v0.0.0-20230922144027-88e91e3034e9
knative.dev/pkg v0.0.0-20230925085724-0efc1bce35a9
sigs.k8s.io/yaml v1.3.0
)

Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -921,14 +921,14 @@ 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/caching v0.0.0-20230922121835-7f3928f2fc87 h1:L4cEhIIk3OZdn9ng1lVvCsA6ltp9T8hk87TyGXf6Kss=
knative.dev/caching v0.0.0-20230922121835-7f3928f2fc87/go.mod h1:7lRc1s8ozqb8wyMc9TN9XJbX7sQyIZo/5xfnGLvnmYU=
knative.dev/hack v0.0.0-20230922114927-da6e74ccb8e8 h1:/+fz5u4W5CfgUKaWlLKqtxzOJttg5GF8pw8mLWrEWWg=
knative.dev/hack v0.0.0-20230922114927-da6e74ccb8e8/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-20230922122916-05a411a3e26f h1:ljGTwmELtmwa9VQ1TKW6wYxmnQYfQ9RUE5qkkh2cZ/w=
knative.dev/pkg v0.0.0-20230922122916-05a411a3e26f/go.mod h1:gWKApiC/FE1WUfnxR2l9xg95awiRZrK7i6LmgErAoro=
knative.dev/caching v0.0.0-20230922143727-f45a005abea0 h1:tM8WdS83dUTatztcVzFMxxxtXTIC8eGB6GaGsL29dNM=
knative.dev/caching v0.0.0-20230922143727-f45a005abea0/go.mod h1:JcbbzvJaddryKX8qfC1pnAdysAIZE2Chn9H9vY5FYvc=
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-20230922144027-88e91e3034e9 h1:o7ChTaWJF1GuvS6TuJfAs/0qVilqeZt6jh4wuOrv2bA=
knative.dev/networking v0.0.0-20230922144027-88e91e3034e9/go.mod h1:zNe2sZyoLV3FkMZRwPQ5XgJqi5k76Zdat0VFK4SAu0M=
knative.dev/pkg v0.0.0-20230925085724-0efc1bce35a9 h1:0GZJ6ZTAkS59goRuMVc5t9vNMmegbggrB/A7pTm2USE=
knative.dev/pkg v0.0.0-20230925085724-0efc1bce35a9/go.mod h1:HagK8mQdSVdmm2xSYMpl4iCLjhxPoPJdY1/NuuEvAVw=
pgregory.net/rapid v1.0.0 h1:iQaM2w5PZ6xvt6x7hbd7tiDS+nk7YPp5uCaEba+T/F4=
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=
Expand Down
24 changes: 16 additions & 8 deletions vendor/knative.dev/pkg/resolver/addressable_resolver.go
View file
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
8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# knative.dev/caching v0.0.0-20230922121835-7f3928f2fc87
# knative.dev/caching v0.0.0-20230922143727-f45a005abea0
## explicit; go 1.18
knative.dev/caching/config
knative.dev/caching/pkg/apis/caching
Expand All @@ -1284,11 +1284,11 @@ knative.dev/caching/pkg/client/injection/informers/caching/v1alpha1/image/fake
knative.dev/caching/pkg/client/injection/informers/factory
knative.dev/caching/pkg/client/injection/informers/factory/fake
knative.dev/caching/pkg/client/listers/caching/v1alpha1
# knative.dev/hack v0.0.0-20230922114927-da6e74ccb8e8
# knative.dev/hack v0.0.0-20230922134855-34850cddd60a
## explicit; go 1.18
knative.dev/hack
knative.dev/hack/shell
# knative.dev/networking v0.0.0-20230922121936-65a08ef1061d
# knative.dev/networking v0.0.0-20230922144027-88e91e3034e9
## explicit; go 1.18
knative.dev/networking/config
knative.dev/networking/pkg
Expand Down Expand Up @@ -1327,7 +1327,7 @@ knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/ingress
knative.dev/networking/pkg/k8s
knative.dev/networking/pkg/prober
# knative.dev/pkg v0.0.0-20230922122916-05a411a3e26f
# 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

0 comments on commit 4182374

Please sign in to comment.