Skip to content

Commit a79398e

Browse files
committed
Add support for WebSocket for retrieval
Sonobuoy uses SPDY to retrieve results, but SPDY is already deprecated [1], and some of my customers block SPDY. Kubernetes migrated from SPDY to WebSocket starting with version 1.31 [2]. Therefore, we will also introduce WebSocket for sonobuoy. To maintain backward compatibility, it will fall back to SPDY if the WebSocket connection fails. [1] https://en.wikipedia.org/wiki/SPDY [2] https://kubernetes.io/blog/2024/08/20/websockets-transition/ Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
1 parent 226820a commit a79398e

File tree

3 files changed

+101
-194
lines changed

3 files changed

+101
-194
lines changed

go.mod

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,31 @@ require (
2020
golang.org/x/text v0.23.0
2121
gopkg.in/yaml.v2 v2.4.0
2222
gopkg.in/yaml.v3 v3.0.1
23-
k8s.io/api v0.27.1
24-
k8s.io/apimachinery v0.27.1
25-
k8s.io/client-go v0.27.1
23+
k8s.io/api v0.31.0
24+
k8s.io/apimachinery v0.31.0
25+
k8s.io/client-go v0.31.0
2626
k8s.io/klog v1.0.0
27-
sigs.k8s.io/yaml v1.3.0
27+
sigs.k8s.io/yaml v1.4.0
2828
)
2929

3030
require (
3131
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
3232
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
34-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
33+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3534
github.com/fatih/color v1.14.1 // indirect
3635
github.com/fsnotify/fsnotify v1.7.0 // indirect
37-
github.com/go-logr/logr v1.2.3 // indirect
36+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
37+
github.com/go-logr/logr v1.4.2 // indirect
3838
github.com/go-openapi/jsonpointer v0.19.6 // indirect
39-
github.com/go-openapi/jsonreference v0.20.1 // indirect
40-
github.com/go-openapi/swag v0.22.3 // indirect
39+
github.com/go-openapi/jsonreference v0.20.2 // indirect
40+
github.com/go-openapi/swag v0.22.4 // indirect
4141
github.com/gogo/protobuf v1.3.2 // indirect
42-
github.com/golang/protobuf v1.5.3 // indirect
43-
github.com/google/gnostic v0.6.9 // indirect
44-
github.com/google/go-cmp v0.5.9 // indirect
42+
github.com/golang/protobuf v1.5.4 // indirect
43+
github.com/google/gnostic-models v0.6.8 // indirect
44+
github.com/google/go-cmp v0.6.0 // indirect
4545
github.com/google/gofuzz v1.2.0 // indirect
46-
github.com/google/uuid v1.4.0 // indirect
46+
github.com/google/uuid v1.6.0 // indirect
47+
github.com/gorilla/websocket v1.5.0 // indirect
4748
github.com/hashicorp/hcl v1.0.0 // indirect
4849
github.com/imdario/mergo v0.3.13 // indirect
4950
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -54,10 +55,11 @@ require (
5455
github.com/mattn/go-colorable v0.1.13 // indirect
5556
github.com/mattn/go-isatty v0.0.17 // indirect
5657
github.com/mitchellh/mapstructure v1.5.0 // indirect
57-
github.com/moby/spdystream v0.2.0 // indirect
58+
github.com/moby/spdystream v0.4.0 // indirect
5859
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5960
github.com/modern-go/reflect2 v1.0.2 // indirect
6061
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
62+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6163
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
6264
github.com/russross/blackfriday/v2 v2.1.0 // indirect
6365
github.com/sagikazarmark/locafero v0.4.0 // indirect
@@ -66,20 +68,21 @@ require (
6668
github.com/spf13/afero v1.11.0 // indirect
6769
github.com/spf13/cast v1.6.0 // indirect
6870
github.com/subosito/gotenv v1.6.0 // indirect
71+
github.com/x448/float16 v0.8.4 // indirect
6972
go.uber.org/atomic v1.9.0 // indirect
7073
go.uber.org/multierr v1.9.0 // indirect
7174
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
7275
golang.org/x/net v0.38.0 // indirect
73-
golang.org/x/oauth2 v0.15.0 // indirect
76+
golang.org/x/oauth2 v0.21.0 // indirect
7477
golang.org/x/sys v0.31.0 // indirect
7578
golang.org/x/time v0.5.0 // indirect
76-
google.golang.org/appengine v1.6.7 // indirect
77-
google.golang.org/protobuf v1.33.0 // indirect
79+
google.golang.org/protobuf v1.34.2 // indirect
80+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7881
gopkg.in/inf.v0 v0.9.1 // indirect
7982
gopkg.in/ini.v1 v1.67.0 // indirect
80-
k8s.io/klog/v2 v2.90.1 // indirect
81-
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
82-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
83+
k8s.io/klog/v2 v2.130.1 // indirect
84+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
85+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
8386
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
84-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
87+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
8588
)

0 commit comments

Comments
 (0)