Skip to content

Commit 853baa3

Browse files
upgrade to latest dependencies
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]>
1 parent 18a7f03 commit 853baa3

File tree

6 files changed

+47
-27
lines changed

6 files changed

+47
-27
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
k8s.io/client-go v0.30.3
2222
k8s.io/code-generator v0.30.3
2323
knative.dev/caching v0.0.0-20241128013742-9f3a58ce332c
24-
knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f
24+
knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f
2525
knative.dev/hack v0.0.0-20241128013751-1978b3a02667
2626
knative.dev/pkg v0.0.0-20241128013618-f3ab5605e542
2727
knative.dev/reconciler-test v0.0.0-20241128013747-984ae1257c23

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1393,8 +1393,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
13931393
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
13941394
knative.dev/caching v0.0.0-20241128013742-9f3a58ce332c h1:NND36MXXBff0As80pG1uOrO8iBg9k0jdrKrRWT4NVy0=
13951395
knative.dev/caching v0.0.0-20241128013742-9f3a58ce332c/go.mod h1:xcxIBx5jKR4HANCbcN4If+uNU1Y76b/tn9eV1byvJKc=
1396-
knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f h1:/YJ3/IMnOdGaFCBuk0dzLtwu010RkXTqw0FttENxl2M=
1397-
knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f/go.mod h1:RxMFtxk903ZoxyS140MPdLLePTzBdeaGkVmBTB52t04=
1396+
knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f h1:j99LZZlXA9cM4iT0zxTCQXyNfCQbpabSa7/V6XOCCJI=
1397+
knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f/go.mod h1:RxMFtxk903ZoxyS140MPdLLePTzBdeaGkVmBTB52t04=
13981398
knative.dev/hack v0.0.0-20241128013751-1978b3a02667 h1:cp3GfEBnL0H2OrqdxLZ7nZ2K7U4PMdQhdBogl4Vd5+E=
13991399
knative.dev/hack v0.0.0-20241128013751-1978b3a02667/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
14001400
knative.dev/networking v0.0.0-20241118075147-929a5d5f19d0 h1:3vj6wR95isnuqgjQzcclyrzaodv5Jvjc7xq4Bv0yde8=

vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/requestreply_defaults.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121

2222
"k8s.io/utils/ptr"
23+
"knative.dev/eventing/pkg/apis/feature"
2324
"knative.dev/pkg/apis"
2425
)
2526

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

3132
func (rrs *RequestReplySpec) SetDefaults(ctx context.Context) {
3233
if rrs.Timeout == nil || *rrs.Timeout == "" {
33-
rrs.Timeout = ptr.To("30s")
34+
rrs.Timeout = ptr.To(feature.FromContextOrDefaults(ctx).RequestReplyDefaultTimeout())
3435
}
3536

3637
if rrs.CorrelationAttribute == "" {

vendor/knative.dev/eventing/pkg/apis/feature/features.go

+28-10
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ const (
6767

6868
// DefaultOIDCDiscoveryURL is the default OIDC Discovery URL used in most Kubernetes clusters.
6969
DefaultOIDCDiscoveryBaseURL Flag = "https://kubernetes.default.svc"
70+
71+
// DefaultRequestReplyTimeout is a value for RequestReplyDefaultTimeout that indicates to timeout
72+
// a RequestReply resource after 30 seconds by default.
73+
DefaultRequestReplyTimeout Flag = "30s"
7074
)
7175

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

7680
func newDefaults() Flags {
7781
return map[string]Flag{
78-
KReferenceGroup: Disabled,
79-
DeliveryRetryAfter: Disabled,
80-
DeliveryTimeout: Enabled,
81-
KReferenceMapping: Disabled,
82-
TransportEncryption: Disabled,
83-
OIDCAuthentication: Disabled,
84-
EvenTypeAutoCreate: Disabled,
85-
NewAPIServerFilters: Disabled,
86-
AuthorizationDefaultMode: AuthorizationAllowSameNamespace,
87-
OIDCDiscoveryBaseURL: DefaultOIDCDiscoveryBaseURL,
82+
KReferenceGroup: Disabled,
83+
DeliveryRetryAfter: Disabled,
84+
DeliveryTimeout: Enabled,
85+
KReferenceMapping: Disabled,
86+
TransportEncryption: Disabled,
87+
OIDCAuthentication: Disabled,
88+
EvenTypeAutoCreate: Disabled,
89+
NewAPIServerFilters: Disabled,
90+
AuthorizationDefaultMode: AuthorizationAllowSameNamespace,
91+
OIDCDiscoveryBaseURL: DefaultOIDCDiscoveryBaseURL,
92+
RequestReplyDefaultTimeout: DefaultRequestReplyTimeout,
8893
}
8994
}
9095

@@ -151,6 +156,19 @@ func (e Flags) OIDCDiscoveryBaseURL() string {
151156
return string(discoveryUrl)
152157
}
153158

159+
func (e Flags) RequestReplyDefaultTimeout() string {
160+
if e == nil {
161+
return string(DefaultRequestReplyTimeout)
162+
}
163+
164+
timeout, ok := e[RequestReplyDefaultTimeout]
165+
if !ok {
166+
return string(DefaultRequestReplyTimeout)
167+
}
168+
169+
return string(timeout)
170+
}
171+
154172
func (e Flags) String() string {
155173
return fmt.Sprintf("%+v", map[string]Flag(e))
156174
}

vendor/knative.dev/eventing/pkg/apis/feature/flag_names.go

+13-12
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ limitations under the License.
1717
package feature
1818

1919
const (
20-
KReferenceGroup = "kreference-group"
21-
DeliveryRetryAfter = "delivery-retryafter"
22-
DeliveryTimeout = "delivery-timeout"
23-
KReferenceMapping = "kreference-mapping"
24-
TransportEncryption = "transport-encryption"
25-
EvenTypeAutoCreate = "eventtype-auto-create"
26-
OIDCAuthentication = "authentication-oidc"
27-
NodeSelectorLabel = "apiserversources-nodeselector-"
28-
CrossNamespaceEventLinks = "cross-namespace-event-links"
29-
NewAPIServerFilters = "new-apiserversource-filters"
30-
AuthorizationDefaultMode = "default-authorization-mode"
31-
OIDCDiscoveryBaseURL = "oidc-discovery-base-url"
20+
KReferenceGroup = "kreference-group"
21+
DeliveryRetryAfter = "delivery-retryafter"
22+
DeliveryTimeout = "delivery-timeout"
23+
KReferenceMapping = "kreference-mapping"
24+
TransportEncryption = "transport-encryption"
25+
EvenTypeAutoCreate = "eventtype-auto-create"
26+
OIDCAuthentication = "authentication-oidc"
27+
NodeSelectorLabel = "apiserversources-nodeselector-"
28+
CrossNamespaceEventLinks = "cross-namespace-event-links"
29+
NewAPIServerFilters = "new-apiserversource-filters"
30+
AuthorizationDefaultMode = "default-authorization-mode"
31+
OIDCDiscoveryBaseURL = "oidc-discovery-base-url"
32+
RequestReplyDefaultTimeout = "requestreply-default-timeout"
3233
)

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,7 @@ k8s.io/utils/trace
13681368
## explicit; go 1.22.7
13691369
knative.dev/caching/pkg/apis/caching
13701370
knative.dev/caching/pkg/apis/caching/v1alpha1
1371-
# knative.dev/eventing v0.43.1-0.20241204070744-7bb320cf6a4f
1371+
# knative.dev/eventing v0.43.1-0.20241205140047-bff7b031831f
13721372
## explicit; go 1.22.7
13731373
knative.dev/eventing/cmd/heartbeats
13741374
knative.dev/eventing/pkg/apis

0 commit comments

Comments
 (0)