Skip to content

Commit

Permalink
upgrade to latest dependencies
Browse files Browse the repository at this point in the history
bumping knative.dev/eventing 7bb320c...bff7b03:
  > bff7b03 Remove unused filter function (# 8375)
  > 8d8b6c9 RequestReply: Added feature flag for default timeout (# 8361)

Signed-off-by: Knative Automation <[email protected]>
  • Loading branch information
knative-automation committed Dec 6, 2024
1 parent 18a7f03 commit 853baa3
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 27 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
k8s.io/client-go v0.30.3
k8s.io/code-generator v0.30.3
knative.dev/caching v0.0.0-20241128013742-9f3a58ce332c
knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f
knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f
knative.dev/hack v0.0.0-20241128013751-1978b3a02667
knative.dev/pkg v0.0.0-20241128013618-f3ab5605e542
knative.dev/reconciler-test v0.0.0-20241128013747-984ae1257c23
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1393,8 +1393,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/caching v0.0.0-20241128013742-9f3a58ce332c h1:NND36MXXBff0As80pG1uOrO8iBg9k0jdrKrRWT4NVy0=
knative.dev/caching v0.0.0-20241128013742-9f3a58ce332c/go.mod h1:xcxIBx5jKR4HANCbcN4If+uNU1Y76b/tn9eV1byvJKc=
knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f h1:/YJ3/IMnOdGaFCBuk0dzLtwu010RkXTqw0FttENxl2M=
knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f/go.mod h1:RxMFtxk903ZoxyS140MPdLLePTzBdeaGkVmBTB52t04=
knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f h1:j99LZZlXA9cM4iT0zxTCQXyNfCQbpabSa7/V6XOCCJI=
knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f/go.mod h1:RxMFtxk903ZoxyS140MPdLLePTzBdeaGkVmBTB52t04=
knative.dev/hack v0.0.0-20241128013751-1978b3a02667 h1:cp3GfEBnL0H2OrqdxLZ7nZ2K7U4PMdQhdBogl4Vd5+E=
knative.dev/hack v0.0.0-20241128013751-1978b3a02667/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/networking v0.0.0-20241118075147-929a5d5f19d0 h1:3vj6wR95isnuqgjQzcclyrzaodv5Jvjc7xq4Bv0yde8=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"

"k8s.io/utils/ptr"
"knative.dev/eventing/pkg/apis/feature"
"knative.dev/pkg/apis"
)

Expand All @@ -30,7 +31,7 @@ func (rr *RequestReply) SetDefaults(ctx context.Context) {

func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) {
if rrs.Timeout == nil || *rrs.Timeout == "" {
rrs.Timeout = ptr.To("30s")
rrs.Timeout = ptr.To(feature.FromContextOrDefaults(ctx).RequestReplyDefaultTimeout())
}

if rrs.CorrelationAttribute == "" {
Expand Down
38 changes: 28 additions & 10 deletions vendor/knative.dev/eventing/pkg/apis/feature/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ const (

// DefaultOIDCDiscoveryURL is the default OIDC Discovery URL used in most Kubernetes clusters.
DefaultOIDCDiscoveryBaseURL Flag = "https://kubernetes.default.svc"

// DefaultRequestReplyTimeout is a value for RequestReplyDefaultTimeout that indicates to timeout
// a RequestReply resource after 30 seconds by default.
DefaultRequestReplyTimeout Flag = "30s"
)

// Flags is a map containing all the enabled/disabled flags for the experimental features.
Expand All @@ -75,16 +79,17 @@ type Flags map[string]Flag

func newDefaults() Flags {
return map[string]Flag{
KReferenceGroup: Disabled,
DeliveryRetryAfter: Disabled,
DeliveryTimeout: Enabled,
KReferenceMapping: Disabled,
TransportEncryption: Disabled,
OIDCAuthentication: Disabled,
EvenTypeAutoCreate: Disabled,
NewAPIServerFilters: Disabled,
AuthorizationDefaultMode: AuthorizationAllowSameNamespace,
OIDCDiscoveryBaseURL: DefaultOIDCDiscoveryBaseURL,
KReferenceGroup: Disabled,
DeliveryRetryAfter: Disabled,
DeliveryTimeout: Enabled,
KReferenceMapping: Disabled,
TransportEncryption: Disabled,
OIDCAuthentication: Disabled,
EvenTypeAutoCreate: Disabled,
NewAPIServerFilters: Disabled,
AuthorizationDefaultMode: AuthorizationAllowSameNamespace,
OIDCDiscoveryBaseURL: DefaultOIDCDiscoveryBaseURL,
RequestReplyDefaultTimeout: DefaultRequestReplyTimeout,
}
}

Expand Down Expand Up @@ -151,6 +156,19 @@ func (e Flags) OIDCDiscoveryBaseURL() string {
return string(discoveryUrl)
}

func (e Flags) RequestReplyDefaultTimeout() string {
if e == nil {
return string(DefaultRequestReplyTimeout)
}

timeout, ok := e[RequestReplyDefaultTimeout]
if !ok {
return string(DefaultRequestReplyTimeout)
}

return string(timeout)
}

func (e Flags) String() string {
return fmt.Sprintf("%+v", map[string]Flag(e))
}
Expand Down
25 changes: 13 additions & 12 deletions vendor/knative.dev/eventing/pkg/apis/feature/flag_names.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ limitations under the License.
package feature

const (
KReferenceGroup = "kreference-group"
DeliveryRetryAfter = "delivery-retryafter"
DeliveryTimeout = "delivery-timeout"
KReferenceMapping = "kreference-mapping"
TransportEncryption = "transport-encryption"
EvenTypeAutoCreate = "eventtype-auto-create"
OIDCAuthentication = "authentication-oidc"
NodeSelectorLabel = "apiserversources-nodeselector-"
CrossNamespaceEventLinks = "cross-namespace-event-links"
NewAPIServerFilters = "new-apiserversource-filters"
AuthorizationDefaultMode = "default-authorization-mode"
OIDCDiscoveryBaseURL = "oidc-discovery-base-url"
KReferenceGroup = "kreference-group"
DeliveryRetryAfter = "delivery-retryafter"
DeliveryTimeout = "delivery-timeout"
KReferenceMapping = "kreference-mapping"
TransportEncryption = "transport-encryption"
EvenTypeAutoCreate = "eventtype-auto-create"
OIDCAuthentication = "authentication-oidc"
NodeSelectorLabel = "apiserversources-nodeselector-"
CrossNamespaceEventLinks = "cross-namespace-event-links"
NewAPIServerFilters = "new-apiserversource-filters"
AuthorizationDefaultMode = "default-authorization-mode"
OIDCDiscoveryBaseURL = "oidc-discovery-base-url"
RequestReplyDefaultTimeout = "requestreply-default-timeout"
)
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ k8s.io/utils/trace
## explicit; go 1.22.7
knative.dev/caching/pkg/apis/caching
knative.dev/caching/pkg/apis/caching/v1alpha1
# knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f
# knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f
## explicit; go 1.22.7
knative.dev/eventing/cmd/heartbeats
knative.dev/eventing/pkg/apis
Expand Down

0 comments on commit 853baa3

Please sign in to comment.