github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

Refactor wsstream library from apiserver to apimachinery

Browse Source
This commit is contained in:
Sean Sullivan 2023-05-22 10:03:17 -07:00
parent c042d6956f
commit 8f3109da79
13 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
staging/src/k8s.io/apiserver/pkg/util/wsstream/conn.go → staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/conn.go
View File

0
staging/src/k8s.io/apiserver/pkg/util/wsstream/conn_test.go → staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/conn_test.go
View File

2
staging/src/k8s.io/apiserver/pkg/util/wsstream/doc.go → staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/doc.go
View File

@ -18,4 +18,4 @@ limitations under the License.
// The Conn type allows callers to multiplex multiple read/write channels over // The Conn type allows callers to multiplex multiple read/write channels over
// a single websocket. The Reader type allows an io.Reader to be copied over // a single websocket. The Reader type allows an io.Reader to be copied over
// a websocket channel as binary content. // a websocket channel as binary content.
package wsstream // import "k8s.io/apiserver/pkg/util/wsstream" package wsstream // import "k8s.io/apimachinery/pkg/util/httpstream/wsstream"

0
staging/src/k8s.io/apiserver/pkg/util/wsstream/stream.go → staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/stream.go
View File

0
staging/src/k8s.io/apiserver/pkg/util/wsstream/stream_test.go → staging/src/k8s.io/apimachinery/pkg/util/httpstream/wsstream/stream_test.go
View File

2
staging/src/k8s.io/apiserver/pkg/authentication/request/websocket/protocol.go
View File

@ -24,8 +24,8 @@ import (
"strings" "strings"
"unicode/utf8" "unicode/utf8"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
"k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/apiserver/pkg/authentication/authenticator"
"k8s.io/apiserver/pkg/util/wsstream"
) )
const bearerProtocolPrefix = "base64url.bearer.authorization.k8s.io." const bearerProtocolPrefix = "base64url.bearer.authorization.k8s.io."

2
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go
View File

@ -34,6 +34,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/audit" "k8s.io/apiserver/pkg/audit"
"k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
@ -42,7 +43,6 @@ import (
"k8s.io/apiserver/pkg/registry/rest" "k8s.io/apiserver/pkg/registry/rest"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/apiserver/pkg/util/flushwriter" "k8s.io/apiserver/pkg/util/flushwriter"
"k8s.io/apiserver/pkg/util/wsstream"
"k8s.io/component-base/tracing" "k8s.io/component-base/tracing"
) )

2
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go
View File

@ -30,12 +30,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/runtime/serializer/streaming"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/endpoints/handlers/negotiation" "k8s.io/apiserver/pkg/endpoints/handlers/negotiation"
"k8s.io/apiserver/pkg/endpoints/metrics" "k8s.io/apiserver/pkg/endpoints/metrics"
apirequest "k8s.io/apiserver/pkg/endpoints/request" apirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/util/wsstream"
) )
// nothing will ever be sent down this channel // nothing will ever be sent down this channel

2
staging/src/k8s.io/kubelet/pkg/cri/streaming/portforward/portforward.go
View File

@ -23,8 +23,8 @@ import (
"time" "time"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/util/wsstream"
) )
// PortForwarder knows how to forward content from a data stream to/from a port // PortForwarder knows how to forward content from a data stream to/from a port

2
staging/src/k8s.io/kubelet/pkg/cri/streaming/portforward/websocket.go
View File

@ -31,9 +31,9 @@ import (
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/endpoints/responsewriter" "k8s.io/apiserver/pkg/endpoints/responsewriter"
"k8s.io/apiserver/pkg/util/wsstream"
) )
const ( const (

2
staging/src/k8s.io/kubelet/pkg/cri/streaming/remotecommand/httpstream.go
View File

@ -29,9 +29,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/httpstream"
"k8s.io/apimachinery/pkg/util/httpstream/spdy" "k8s.io/apimachinery/pkg/util/httpstream/spdy"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/util/wsstream"
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
"k8s.io/klog/v2" "k8s.io/klog/v2"

2
staging/src/k8s.io/kubelet/pkg/cri/streaming/remotecommand/websocket.go
View File

@ -21,9 +21,9 @@ import (
"net/http" "net/http"
"time" "time"
"k8s.io/apimachinery/pkg/util/httpstream/wsstream"
"k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/endpoints/responsewriter" "k8s.io/apiserver/pkg/endpoints/responsewriter"
"k8s.io/apiserver/pkg/util/wsstream"
) )
const ( const (

2
vendor/modules.txt vendored
View File

@ -1386,6 +1386,7 @@ k8s.io/apimachinery/pkg/util/errors
k8s.io/apimachinery/pkg/util/framer k8s.io/apimachinery/pkg/util/framer
k8s.io/apimachinery/pkg/util/httpstream k8s.io/apimachinery/pkg/util/httpstream
k8s.io/apimachinery/pkg/util/httpstream/spdy k8s.io/apimachinery/pkg/util/httpstream/spdy
k8s.io/apimachinery/pkg/util/httpstream/wsstream
k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/intstr
k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/json
k8s.io/apimachinery/pkg/util/jsonmergepatch k8s.io/apimachinery/pkg/util/jsonmergepatch
@ -1572,7 +1573,6 @@ k8s.io/apiserver/pkg/util/openapi
k8s.io/apiserver/pkg/util/proxy k8s.io/apiserver/pkg/util/proxy
k8s.io/apiserver/pkg/util/shufflesharding k8s.io/apiserver/pkg/util/shufflesharding
k8s.io/apiserver/pkg/util/webhook k8s.io/apiserver/pkg/util/webhook
k8s.io/apiserver/pkg/util/wsstream
k8s.io/apiserver/pkg/util/x509metrics k8s.io/apiserver/pkg/util/x509metrics
k8s.io/apiserver/pkg/warning k8s.io/apiserver/pkg/warning
k8s.io/apiserver/plugin/pkg/audit/buffered k8s.io/apiserver/plugin/pkg/audit/buffered