From f07f5a4cc367c390b14281a6cce060488d4edfcd Mon Sep 17 00:00:00 2001 From: Michael Fraenkel Date: Wed, 1 Feb 2017 05:46:35 -0700 Subject: [PATCH] Generated code --- api/openapi-spec/swagger.json | 7 +++++++ api/swagger-spec/v1.json | 16 ++++++++++++++++ docs/api-reference/v1/operations.html | 18 +++++++++++++++++- pkg/kubelet/BUILD | 2 ++ pkg/kubelet/server/BUILD | 3 +++ pkg/kubelet/server/portforward/BUILD | 9 ++++++++- pkg/registry/core/pod/BUILD | 2 ++ test/e2e/BUILD | 1 + 8 files changed, 56 insertions(+), 2 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index d97a02bec48..4a8015d9122 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -3792,6 +3792,13 @@ "name": "namespace", "in": "path", "required": true + }, + { + "uniqueItems": true, + "type": "integer", + "description": "List of ports to forward Required when using WebSockets", + "name": "ports", + "in": "query" } ] }, diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 4f43fb6f8c7..09e1f81fe1b 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -9095,6 +9095,14 @@ "summary": "connect GET requests to portforward of Pod", "nickname": "connectGetNamespacedPodPortforward", "parameters": [ + { + "type": "integer", + "paramType": "query", + "name": "ports", + "description": "List of ports to forward Required when using WebSockets", + "required": false, + "allowMultiple": false + }, { "type": "string", "paramType": "path", @@ -9125,6 +9133,14 @@ "summary": "connect POST requests to portforward of Pod", "nickname": "connectPostNamespacedPodPortforward", "parameters": [ + { + "type": "integer", + "paramType": "query", + "name": "ports", + "description": "List of ports to forward Required when using WebSockets", + "required": false, + "allowMultiple": false + }, { "type": "string", "paramType": "path", diff --git a/docs/api-reference/v1/operations.html b/docs/api-reference/v1/operations.html index a86041e788e..bd7f2c979c9 100755 --- a/docs/api-reference/v1/operations.html +++ b/docs/api-reference/v1/operations.html @@ -9047,6 +9047,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +

QueryParameter

+

ports

+

List of ports to forward Required when using WebSockets

+

false

+

integer (int32)

+ + +

PathParameter

namespace

object name and auth scope, such as for teams and projects

@@ -9152,6 +9160,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } +

QueryParameter

+

ports

+

List of ports to forward Required when using WebSockets

+

false

+

integer (int32)

+ + +

PathParameter

namespace

object name and auth scope, such as for teams and projects

@@ -33308,7 +33324,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 96c9a58a84f..a17e77f31c6 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -72,6 +72,7 @@ go_library( "//pkg/kubelet/rkt:go_default_library", "//pkg/kubelet/secret:go_default_library", "//pkg/kubelet/server:go_default_library", + "//pkg/kubelet/server/portforward:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", "//pkg/kubelet/server/streaming:go_default_library", @@ -177,6 +178,7 @@ go_test( "//pkg/kubelet/prober/results:go_default_library", "//pkg/kubelet/prober/testing:go_default_library", "//pkg/kubelet/secret:go_default_library", + "//pkg/kubelet/server/portforward:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", "//pkg/kubelet/status:go_default_library", diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 1a90c4fcd44..b787b34fe47 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -55,6 +55,7 @@ go_test( srcs = [ "auth_test.go", "server_test.go", + "server_websocket_test.go", ], library = ":go_default_library", tags = ["automanaged"], @@ -64,6 +65,7 @@ go_test( "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", + "//pkg/kubelet/server/portforward:go_default_library", "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", "//pkg/util/term:go_default_library", @@ -72,6 +74,7 @@ go_test( "//vendor:github.com/google/cadvisor/info/v2", "//vendor:github.com/stretchr/testify/assert", "//vendor:github.com/stretchr/testify/require", + "//vendor:golang.org/x/net/websocket", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/types", diff --git a/pkg/kubelet/server/portforward/BUILD b/pkg/kubelet/server/portforward/BUILD index ee1978fd599..a5247846bf0 100644 --- a/pkg/kubelet/server/portforward/BUILD +++ b/pkg/kubelet/server/portforward/BUILD @@ -12,7 +12,9 @@ go_library( name = "go_default_library", srcs = [ "constants.go", + "httpstream.go", "portforward.go", + "websocket.go", ], tags = ["automanaged"], deps = [ @@ -22,12 +24,17 @@ go_library( "//vendor:k8s.io/apimachinery/pkg/util/httpstream", "//vendor:k8s.io/apimachinery/pkg/util/httpstream/spdy", "//vendor:k8s.io/apimachinery/pkg/util/runtime", + "//vendor:k8s.io/apiserver/pkg/server/httplog", + "//vendor:k8s.io/apiserver/pkg/util/wsstream", ], ) go_test( name = "go_default_test", - srcs = ["portforward_test.go"], + srcs = [ + "httpstream_test.go", + "websocket_test.go", + ], library = ":go_default_library", tags = ["automanaged"], deps = [ diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index 9b0e3f86af6..e914bd64946 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -43,12 +43,14 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testing:go_default_library", + "//pkg/kubelet/client:go_default_library", "//vendor:k8s.io/apimachinery/pkg/api/errors", "//vendor:k8s.io/apimachinery/pkg/api/resource", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/fields", "//vendor:k8s.io/apimachinery/pkg/labels", "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/types", "//vendor:k8s.io/apiserver/pkg/endpoints/request", ], ) diff --git a/test/e2e/BUILD b/test/e2e/BUILD index 2f7c89f8a1e..e23e58c0735 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -169,6 +169,7 @@ go_library( "//vendor:github.com/onsi/gomega", "//vendor:github.com/stretchr/testify/assert", "//vendor:golang.org/x/crypto/ssh", + "//vendor:golang.org/x/net/websocket", "//vendor:google.golang.org/api/compute/v1", "//vendor:google.golang.org/api/googleapi", "//vendor:gopkg.in/inf.v0",