Skip to content

Commit c6ef369

Browse files
upgrade to latest dependencies (#489)
bumping knative.dev/networking 75dcd54...a595805: > a595805 Run ./hack/update-deps.sh --upgrade --release 1.11 (# 878) bumping knative.dev/pkg bd99f2f...56bfe0d: > 56bfe0d [release-1.11] [CVE-2023-44487] Disable http2 for webhooks (# 2875) bumping knative.dev/serving f60eb32...4ff7168: > 4ff7168 [release-1.11] bump x/net to v0.17 (# 14516) > fb9129c Leave a comment which will trigger a new dot release (# 14500) bumping knative.dev/eventing 6a695cb...0dadfd9: > 0dadfd9 [release-1.11] Scheduler: fix reserved replicas handling, blocking autoscaler and overcommitted pods (# 7374) > c1626f1 [release-1.11] Update dependencies (# 7362) > 46cc775 [release-1.11] TLS certificate rotation tests (# 7103) (# 7346) Signed-off-by: Knative Automation <[email protected]>
1 parent 6c47698 commit c6ef369

File tree

4 files changed

+34
-16
lines changed

4 files changed

+34
-16
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ require (
1313
k8s.io/api v0.26.5
1414
k8s.io/apimachinery v0.26.5
1515
k8s.io/client-go v0.26.5
16-
knative.dev/eventing v0.38.4
16+
knative.dev/eventing v0.38.5
1717
knative.dev/hack v0.0.0-20230712131415-ddae80293c43
18-
knative.dev/pkg v0.0.0-20231011193800-bd99f2f98be7
19-
knative.dev/serving v0.38.1
18+
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626
19+
knative.dev/serving v0.38.2
2020
)
2121

2222
require (
@@ -103,7 +103,7 @@ require (
103103
k8s.io/klog/v2 v2.80.2-0.20221028030830-9ae4992afb54 // indirect
104104
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
105105
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
106-
knative.dev/networking v0.0.0-20230718160410-75dcd54d9510 // indirect
106+
knative.dev/networking v0.0.0-20231012062757-a5958051caf8 // indirect
107107
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
108108
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
109109
sigs.k8s.io/yaml v1.3.0 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -816,16 +816,16 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O
816816
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
817817
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8=
818818
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
819-
knative.dev/eventing v0.38.4 h1:eH059bfeLilj2xAN6V7XXOh3wqzz5ssoMS/CIJpJfmk=
820-
knative.dev/eventing v0.38.4/go.mod h1:ct8t+v6nmp1kFCy6ngkDWIEvnjJDNDoKptrfnQVh+z8=
819+
knative.dev/eventing v0.38.5 h1:NvSy3lek9IbLLWEot36NyAfNv7VkJNl38F1ItVL0D6s=
820+
knative.dev/eventing v0.38.5/go.mod h1:g+iAS+KBRSKULEPqoVnseMkObDeq3SJhqefbuIu8zY8=
821821
knative.dev/hack v0.0.0-20230712131415-ddae80293c43 h1:3SE06uNfSFGm/5XS+0trbyCUpgsOaBeyhPQU8FPNFz8=
822822
knative.dev/hack v0.0.0-20230712131415-ddae80293c43/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
823-
knative.dev/networking v0.0.0-20230718160410-75dcd54d9510 h1:eNbWjEkbtGjCqK5TB4S0CjSSDd4PvyXm+w7bM9/zce4=
824-
knative.dev/networking v0.0.0-20230718160410-75dcd54d9510/go.mod h1:Vngl91M++hqgoGNIjCii7MXnsEeN3kRbGC1aodhFqbk=
825-
knative.dev/pkg v0.0.0-20231011193800-bd99f2f98be7 h1:y3qbfYX1SuSr/1ysXvKfpV8q/kCwWLWieCUgAhBUHmQ=
826-
knative.dev/pkg v0.0.0-20231011193800-bd99f2f98be7/go.mod h1:g+UCgSKQ2f15kHYu/V3CPtoKo5F1x/2Y1ot0NSK7gA0=
827-
knative.dev/serving v0.38.1 h1:ALKyyKA1Xf083Es2SOE8HeCy/vFhFWE6TcHNxurDf5k=
828-
knative.dev/serving v0.38.1/go.mod h1:3/KPMVdVOZSHdrRhvelLuxuO+Ftln2ZTKq8R3gUu6Gw=
823+
knative.dev/networking v0.0.0-20231012062757-a5958051caf8 h1:oZMbAAXyiDZUYoQ4qEjL6uxXrL1xBVfEyQJx8sP0XEg=
824+
knative.dev/networking v0.0.0-20231012062757-a5958051caf8/go.mod h1:XwZwqJoLZR92N6F/sj8lHxttnry/Kiz+OgG8+uVuYn0=
825+
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626 h1:qFE+UDBRg6cpF5LbA0sv1XK4XZ36Z7aTRCa+HcuxnNQ=
826+
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626/go.mod h1:g+UCgSKQ2f15kHYu/V3CPtoKo5F1x/2Y1ot0NSK7gA0=
827+
knative.dev/serving v0.38.2 h1:xxxC5JUwHzzssSeEWYs9DcuXlNtV9RHMX/VIlHlqa+M=
828+
knative.dev/serving v0.38.2/go.mod h1:/eWvWu4qo7+tkfc7FemNXcCtb3W8FNk1tCqAKC12WPo=
829829
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
830830
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
831831
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

vendor/knative.dev/pkg/webhook/webhook.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ type Options struct {
7474
// ControllerOptions encapsulates options for creating a new controller,
7575
// including throttling and stats behavior.
7676
ControllerOptions *controller.ControllerOptions
77+
78+
// EnableHTTP2 enables HTTP2 for webhooks.
79+
// Mitigate CVE-2023-44487 by disabling HTTP2 by default until the Go
80+
// standard library and golang.org/x/net are fully fixed.
81+
// Right now, it is possible for authenticated and unauthenticated users to
82+
// hold open HTTP2 connections and consume huge amounts of memory.
83+
// See:
84+
// * https://github.com/kubernetes/kubernetes/pull/121120
85+
// * https://github.com/kubernetes/kubernetes/issues/121197
86+
// * https://github.com/golang/go/issues/63417#issuecomment-1758858612
87+
EnableHTTP2 bool
7788
}
7889

7990
// Operation is the verb being operated on
@@ -237,12 +248,19 @@ func (wh *Webhook) Run(stop <-chan struct{}) error {
237248
QuietPeriod: wh.Options.GracePeriod,
238249
}
239250

251+
// If TLSNextProto is not nil, HTTP/2 support is not enabled automatically.
252+
nextProto := map[string]func(*http.Server, *tls.Conn, http.Handler){}
253+
if wh.Options.EnableHTTP2 {
254+
nextProto = nil
255+
}
256+
240257
server := &http.Server{
241258
ErrorLog: log.New(&zapWrapper{logger}, "", 0),
242259
Handler: drainer,
243260
Addr: fmt.Sprint(":", wh.Options.Port),
244261
TLSConfig: wh.tlsConfig,
245262
ReadHeaderTimeout: time.Minute, //https://medium.com/a-journey-with-go/go-understand-and-mitigate-slowloris-attack-711c1b1403f6
263+
TLSNextProto: nextProto,
246264
}
247265

248266
var serve = server.ListenAndServe

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ k8s.io/utils/net
952952
k8s.io/utils/pointer
953953
k8s.io/utils/strings/slices
954954
k8s.io/utils/trace
955-
# knative.dev/eventing v0.38.4
955+
# knative.dev/eventing v0.38.5
956956
## explicit; go 1.19
957957
knative.dev/eventing/pkg/adapter/v2
958958
knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
@@ -1001,12 +1001,12 @@ knative.dev/eventing/pkg/reconciler/source
10011001
# knative.dev/hack v0.0.0-20230712131415-ddae80293c43
10021002
## explicit; go 1.18
10031003
knative.dev/hack
1004-
# knative.dev/networking v0.0.0-20230718160410-75dcd54d9510
1004+
# knative.dev/networking v0.0.0-20231012062757-a5958051caf8
10051005
## explicit; go 1.18
10061006
knative.dev/networking/pkg/apis/networking
10071007
knative.dev/networking/pkg/apis/networking/v1alpha1
10081008
knative.dev/networking/pkg/config
1009-
# knative.dev/pkg v0.0.0-20231011193800-bd99f2f98be7
1009+
# knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626
10101010
## explicit; go 1.18
10111011
knative.dev/pkg/apis
10121012
knative.dev/pkg/apis/duck
@@ -1059,7 +1059,7 @@ knative.dev/pkg/tracker
10591059
knative.dev/pkg/version
10601060
knative.dev/pkg/webhook
10611061
knative.dev/pkg/webhook/certificates/resources
1062-
# knative.dev/serving v0.38.1
1062+
# knative.dev/serving v0.38.2
10631063
## explicit; go 1.18
10641064
knative.dev/serving/pkg/apis/autoscaling
10651065
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)