mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-10-31 18:28:13 +00:00 
			
		
		
		
	Merge pull request #41331 from dshulyak/import_remotecommand
Automatic merge from submit-queue (batch tested with PRs 41331, 45591, 45600, 45176, 45658) Move client/unversioned/remotecommand to client-go Module remotecommand originally part of kubernetes/pkg/client/unversioned was moved to client-go/tools, and will be used as authoritative in kubectl, e2e and other places. Module remotecommand relies on util/exec module which was copied to client-go/pkg/util
This commit is contained in:
		| @@ -170,7 +170,6 @@ pkg/client/listers/storage/v1beta1 | |||||||
| pkg/client/metrics | pkg/client/metrics | ||||||
| pkg/client/metrics/prometheus | pkg/client/metrics/prometheus | ||||||
| pkg/client/unversioned | pkg/client/unversioned | ||||||
| pkg/client/unversioned/remotecommand |  | ||||||
| pkg/cloudprovider/providers | pkg/cloudprovider/providers | ||||||
| pkg/cloudprovider/providers/azure | pkg/cloudprovider/providers/azure | ||||||
| pkg/cloudprovider/providers/cloudstack | pkg/cloudprovider/providers/cloudstack | ||||||
| @@ -386,6 +385,7 @@ staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp | |||||||
| staging/src/k8s.io/client-go/rest/watch | staging/src/k8s.io/client-go/rest/watch | ||||||
| staging/src/k8s.io/client-go/tools/auth | staging/src/k8s.io/client-go/tools/auth | ||||||
| staging/src/k8s.io/client-go/tools/metrics | staging/src/k8s.io/client-go/tools/metrics | ||||||
|  | staging/src/k8s.io/client-go/tools/remotecommand | ||||||
| staging/src/k8s.io/client-go/util/cert | staging/src/k8s.io/client-go/util/cert | ||||||
| staging/src/k8s.io/client-go/util/homedir | staging/src/k8s.io/client-go/util/homedir | ||||||
| staging/src/k8s.io/client-go/util/workqueue | staging/src/k8s.io/client-go/util/workqueue | ||||||
|   | |||||||
| @@ -25,7 +25,6 @@ go_test( | |||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/client/clientset_generated/internalclientset:go_default_library", |         "//pkg/client/clientset_generated/internalclientset:go_default_library", | ||||||
|         "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", |         "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/server/portforward:go_default_library", |         "//pkg/kubelet/server/portforward:go_default_library", | ||||||
|         "//pkg/kubelet/server/remotecommand:go_default_library", |         "//pkg/kubelet/server/remotecommand:go_default_library", | ||||||
|         "//vendor/github.com/stretchr/testify/require:go_default_library", |         "//vendor/github.com/stretchr/testify/require:go_default_library", | ||||||
| @@ -40,6 +39,7 @@ go_test( | |||||||
|         "//vendor/k8s.io/client-go/rest:go_default_library", |         "//vendor/k8s.io/client-go/rest:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/cache:go_default_library", |         "//vendor/k8s.io/client-go/tools/cache:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/portforward:go_default_library", |         "//vendor/k8s.io/client-go/tools/portforward:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/testing:go_default_library", |         "//vendor/k8s.io/client-go/util/testing:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
| 	. "k8s.io/client-go/tools/portforward" | 	. "k8s.io/client-go/tools/portforward" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/server/portforward" | 	"k8s.io/kubernetes/pkg/kubelet/server/portforward" | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -36,9 +36,9 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/util/httpstream" | 	"k8s.io/apimachinery/pkg/util/httpstream" | ||||||
| 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
|  | 	remoteclient "k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/api/testapi" | 	"k8s.io/kubernetes/pkg/api/testapi" | ||||||
| 	remoteclient "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/server/remotecommand" | 	"k8s.io/kubernetes/pkg/kubelet/server/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -61,7 +61,6 @@ filegroup( | |||||||
|     name = "all-srcs", |     name = "all-srcs", | ||||||
|     srcs = [ |     srcs = [ | ||||||
|         ":package-srcs", |         ":package-srcs", | ||||||
|         "//pkg/client/unversioned/remotecommand:all-srcs", |  | ||||||
|         "//pkg/client/unversioned/testclient/simple:all-srcs", |         "//pkg/client/unversioned/testclient/simple:all-srcs", | ||||||
|     ], |     ], | ||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|   | |||||||
| @@ -84,7 +84,6 @@ go_library( | |||||||
|         "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", |         "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library", | ||||||
|         "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", |         "//pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion:go_default_library", | ||||||
|         "//pkg/client/unversioned:go_default_library", |         "//pkg/client/unversioned:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubectl:go_default_library", |         "//pkg/kubectl:go_default_library", | ||||||
|         "//pkg/kubectl/cmd/auth:go_default_library", |         "//pkg/kubectl/cmd/auth:go_default_library", | ||||||
|         "//pkg/kubectl/cmd/config:go_default_library", |         "//pkg/kubectl/cmd/config:go_default_library", | ||||||
| @@ -142,6 +141,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/client-go/rest:go_default_library", |         "//vendor/k8s.io/client-go/rest:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", |         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/portforward:go_default_library", |         "//vendor/k8s.io/client-go/tools/portforward:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|  |  | ||||||
| @@ -206,7 +206,6 @@ go_test( | |||||||
|         "//pkg/apis/extensions:go_default_library", |         "//pkg/apis/extensions:go_default_library", | ||||||
|         "//pkg/apis/policy:go_default_library", |         "//pkg/apis/policy:go_default_library", | ||||||
|         "//pkg/apis/rbac:go_default_library", |         "//pkg/apis/rbac:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubectl:go_default_library", |         "//pkg/kubectl:go_default_library", | ||||||
|         "//pkg/kubectl/cmd/testing:go_default_library", |         "//pkg/kubectl/cmd/testing:go_default_library", | ||||||
|         "//pkg/kubectl/cmd/util:go_default_library", |         "//pkg/kubectl/cmd/util:go_default_library", | ||||||
| @@ -241,6 +240,7 @@ go_test( | |||||||
|         "//vendor/k8s.io/client-go/rest:go_default_library", |         "//vendor/k8s.io/client-go/rest:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/rest/fake:go_default_library", |         "//vendor/k8s.io/client-go/rest/fake:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/rest/watch:go_default_library", |         "//vendor/k8s.io/client-go/rest/watch:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library", |         "//vendor/k8s.io/heapster/metrics/apis/metrics/v1alpha1:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -29,9 +29,9 @@ import ( | |||||||
| 	utilerrors "k8s.io/apimachinery/pkg/util/errors" | 	utilerrors "k8s.io/apimachinery/pkg/util/errors" | ||||||
| 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates" | 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates" | ||||||
| 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | ||||||
| 	"k8s.io/kubernetes/pkg/kubectl/resource" | 	"k8s.io/kubernetes/pkg/kubectl/resource" | ||||||
|   | |||||||
| @@ -33,8 +33,8 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/runtime/schema" | 	"k8s.io/apimachinery/pkg/runtime/schema" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
| 	"k8s.io/client-go/rest/fake" | 	"k8s.io/client-go/rest/fake" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" | 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" | ||||||
| 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -27,9 +27,9 @@ import ( | |||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates" | 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates" | ||||||
| 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | ||||||
| 	"k8s.io/kubernetes/pkg/util/i18n" | 	"k8s.io/kubernetes/pkg/util/i18n" | ||||||
|   | |||||||
| @@ -32,8 +32,8 @@ import ( | |||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
| 	"k8s.io/client-go/rest/fake" | 	"k8s.io/client-go/rest/fake" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" | 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" | ||||||
| 	"k8s.io/kubernetes/pkg/util/term" | 	"k8s.io/kubernetes/pkg/util/term" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -28,9 +28,9 @@ import ( | |||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
| 	"k8s.io/client-go/tools/portforward" | 	"k8s.io/client-go/tools/portforward" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates" | 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates" | ||||||
| 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | ||||||
| 	"k8s.io/kubernetes/pkg/util/i18n" | 	"k8s.io/kubernetes/pkg/util/i18n" | ||||||
|   | |||||||
| @@ -46,7 +46,6 @@ go_library( | |||||||
|         "//pkg/capabilities:go_default_library", |         "//pkg/capabilities:go_default_library", | ||||||
|         "//pkg/client/clientset_generated/clientset:go_default_library", |         "//pkg/client/clientset_generated/clientset:go_default_library", | ||||||
|         "//pkg/client/listers/core/v1:go_default_library", |         "//pkg/client/listers/core/v1:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/cloudprovider:go_default_library", |         "//pkg/cloudprovider:go_default_library", | ||||||
|         "//pkg/features:go_default_library", |         "//pkg/features:go_default_library", | ||||||
|         "//pkg/fieldpath:go_default_library", |         "//pkg/fieldpath:go_default_library", | ||||||
| @@ -134,6 +133,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", |         "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/cache:go_default_library", |         "//vendor/k8s.io/client-go/tools/cache:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/record:go_default_library", |         "//vendor/k8s.io/client-go/tools/record:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/clock:go_default_library", |         "//vendor/k8s.io/client-go/util/clock:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", |         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/integer:go_default_library", |         "//vendor/k8s.io/client-go/util/integer:go_default_library", | ||||||
|   | |||||||
| @@ -29,7 +29,6 @@ go_library( | |||||||
|         "//pkg/api:go_default_library", |         "//pkg/api:go_default_library", | ||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/api/v1/ref:go_default_library", |         "//pkg/api/v1/ref:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", |         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", | ||||||
|         "//pkg/kubelet/events:go_default_library", |         "//pkg/kubelet/events:go_default_library", | ||||||
|         "//pkg/kubelet/util/format:go_default_library", |         "//pkg/kubelet/util/format:go_default_library", | ||||||
| @@ -46,6 +45,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", |         "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/record:go_default_library", |         "//vendor/k8s.io/client-go/tools/record:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", |         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ package container | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // handleResizing spawns a goroutine that processes the resize channel, calling resizeFunc for each | // handleResizing spawns a goroutine that processes the resize channel, calling resizeFunc for each | ||||||
|   | |||||||
| @@ -26,9 +26,9 @@ import ( | |||||||
|  |  | ||||||
| 	"github.com/golang/glog" | 	"github.com/golang/glog" | ||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/client-go/util/flowcontrol" | 	"k8s.io/client-go/util/flowcontrol" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | ||||||
| 	"k8s.io/kubernetes/pkg/volume" | 	"k8s.io/kubernetes/pkg/volume" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -20,12 +20,12 @@ go_library( | |||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/container:go_default_library", |         "//pkg/kubelet/container:go_default_library", | ||||||
|         "//pkg/volume:go_default_library", |         "//pkg/volume:go_default_library", | ||||||
|         "//vendor/github.com/golang/mock/gomock:go_default_library", |         "//vendor/github.com/golang/mock/gomock:go_default_library", | ||||||
|         "//vendor/github.com/stretchr/testify/mock:go_default_library", |         "//vendor/github.com/stretchr/testify/mock:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", |         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -25,9 +25,9 @@ import ( | |||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/client-go/util/flowcontrol" | 	"k8s.io/client-go/util/flowcontrol" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	. "k8s.io/kubernetes/pkg/kubelet/container" | 	. "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	"k8s.io/kubernetes/pkg/volume" | 	"k8s.io/kubernetes/pkg/volume" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -22,9 +22,9 @@ import ( | |||||||
|  |  | ||||||
| 	"github.com/stretchr/testify/mock" | 	"github.com/stretchr/testify/mock" | ||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/client-go/util/flowcontrol" | 	"k8s.io/client-go/util/flowcontrol" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	. "k8s.io/kubernetes/pkg/kubelet/container" | 	. "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	"k8s.io/kubernetes/pkg/volume" | 	"k8s.io/kubernetes/pkg/volume" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -31,7 +31,6 @@ go_library( | |||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/apis/componentconfig:go_default_library", |         "//pkg/apis/componentconfig:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/apis/cri:go_default_library", |         "//pkg/kubelet/apis/cri:go_default_library", | ||||||
|         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", |         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", | ||||||
|         "//pkg/kubelet/cm:go_default_library", |         "//pkg/kubelet/cm:go_default_library", | ||||||
| @@ -66,6 +65,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -26,8 +26,10 @@ import ( | |||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| 	dockertypes "github.com/docker/engine-api/types" | 	dockertypes "github.com/docker/engine-api/types" | ||||||
|  |  | ||||||
| 	"github.com/golang/glog" | 	"github.com/golang/glog" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | ||||||
| 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/server/streaming" | 	"k8s.io/kubernetes/pkg/kubelet/server/streaming" | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ import ( | |||||||
| 	dockertypes "github.com/docker/engine-api/types" | 	dockertypes "github.com/docker/engine-api/types" | ||||||
| 	"github.com/golang/glog" | 	"github.com/golang/glog" | ||||||
|  |  | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	utilexec "k8s.io/kubernetes/pkg/util/exec" | 	utilexec "k8s.io/kubernetes/pkg/util/exec" | ||||||
| 	"k8s.io/kubernetes/pkg/util/term" | 	"k8s.io/kubernetes/pkg/util/term" | ||||||
|   | |||||||
| @@ -40,13 +40,13 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/util/sets" | 	"k8s.io/apimachinery/pkg/util/sets" | ||||||
| 	utilvalidation "k8s.io/apimachinery/pkg/util/validation" | 	utilvalidation "k8s.io/apimachinery/pkg/util/validation" | ||||||
| 	"k8s.io/apimachinery/pkg/util/validation/field" | 	"k8s.io/apimachinery/pkg/util/validation/field" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	v1helper "k8s.io/kubernetes/pkg/api/v1/helper" | 	v1helper "k8s.io/kubernetes/pkg/api/v1/helper" | ||||||
| 	podutil "k8s.io/kubernetes/pkg/api/v1/pod" | 	podutil "k8s.io/kubernetes/pkg/api/v1/pod" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1/resource" | 	"k8s.io/kubernetes/pkg/api/v1/resource" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1/validation" | 	"k8s.io/kubernetes/pkg/api/v1/validation" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/fieldpath" | 	"k8s.io/kubernetes/pkg/fieldpath" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/cm" | 	"k8s.io/kubernetes/pkg/kubelet/cm" | ||||||
| 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
|   | |||||||
| @@ -24,7 +24,6 @@ go_library( | |||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/credentialprovider:go_default_library", |         "//pkg/credentialprovider:go_default_library", | ||||||
|         "//pkg/kubelet/container:go_default_library", |         "//pkg/kubelet/container:go_default_library", | ||||||
|         "//pkg/kubelet/events:go_default_library", |         "//pkg/kubelet/events:go_default_library", | ||||||
| @@ -58,6 +57,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/record:go_default_library", |         "//vendor/k8s.io/client-go/tools/record:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", |         "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -47,9 +47,9 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/util/uuid" | 	"k8s.io/apimachinery/pkg/util/uuid" | ||||||
| 	utilwait "k8s.io/apimachinery/pkg/util/wait" | 	utilwait "k8s.io/apimachinery/pkg/util/wait" | ||||||
| 	"k8s.io/client-go/tools/record" | 	"k8s.io/client-go/tools/record" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/client-go/util/flowcontrol" | 	"k8s.io/client-go/util/flowcontrol" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/credentialprovider" | 	"k8s.io/kubernetes/pkg/credentialprovider" | ||||||
| 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/events" | 	"k8s.io/kubernetes/pkg/kubelet/events" | ||||||
|   | |||||||
| @@ -20,7 +20,6 @@ go_library( | |||||||
|         "//pkg/api:go_default_library", |         "//pkg/api:go_default_library", | ||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/api/v1/validation:go_default_library", |         "//pkg/api/v1/validation:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/cm:go_default_library", |         "//pkg/kubelet/cm:go_default_library", | ||||||
|         "//pkg/kubelet/container:go_default_library", |         "//pkg/kubelet/container:go_default_library", | ||||||
|         "//pkg/kubelet/server/portforward:go_default_library", |         "//pkg/kubelet/server/portforward:go_default_library", | ||||||
| @@ -48,6 +47,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/apiserver/pkg/server/healthz:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/server/healthz:go_default_library", | ||||||
|         "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library", | ||||||
|         "//vendor/k8s.io/apiserver/pkg/util/flushwriter:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/util/flushwriter:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|  |  | ||||||
| @@ -63,7 +63,6 @@ go_test( | |||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api:go_default_library", |         "//pkg/api:go_default_library", | ||||||
|         "//pkg/api/v1:go_default_library", |         "//pkg/api/v1:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/cm:go_default_library", |         "//pkg/kubelet/cm:go_default_library", | ||||||
|         "//pkg/kubelet/container:go_default_library", |         "//pkg/kubelet/container:go_default_library", | ||||||
|         "//pkg/kubelet/container/testing:go_default_library", |         "//pkg/kubelet/container/testing:go_default_library", | ||||||
| @@ -84,6 +83,7 @@ go_test( | |||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", | ||||||
|         "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library", | ||||||
|         "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/testing:go_default_library", |         "//vendor/k8s.io/client-go/util/testing:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -19,7 +19,6 @@ go_library( | |||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api:go_default_library", |         "//pkg/api:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/util/exec:go_default_library", |         "//pkg/util/exec:go_default_library", | ||||||
|         "//vendor/github.com/golang/glog:go_default_library", |         "//vendor/github.com/golang/glog:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", | ||||||
| @@ -31,6 +30,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", | ||||||
|         "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library", | ||||||
|         "//vendor/k8s.io/apiserver/pkg/util/wsstream:go_default_library", |         "//vendor/k8s.io/apiserver/pkg/util/wsstream:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ import ( | |||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // Attacher knows how to attach to a running container in a pod. | // Attacher knows how to attach to a running container in a pod. | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
| 	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/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	utilexec "k8s.io/kubernetes/pkg/util/exec" | 	utilexec "k8s.io/kubernetes/pkg/util/exec" | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -31,8 +31,8 @@ import ( | |||||||
| 	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/apiserver/pkg/util/wsstream" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
|  |  | ||||||
| 	"github.com/golang/glog" | 	"github.com/golang/glog" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -48,10 +48,10 @@ import ( | |||||||
| 	"k8s.io/apiserver/pkg/server/healthz" | 	"k8s.io/apiserver/pkg/server/healthz" | ||||||
| 	"k8s.io/apiserver/pkg/server/httplog" | 	"k8s.io/apiserver/pkg/server/httplog" | ||||||
| 	"k8s.io/apiserver/pkg/util/flushwriter" | 	"k8s.io/apiserver/pkg/util/flushwriter" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1/validation" | 	"k8s.io/kubernetes/pkg/api/v1/validation" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/cm" | 	"k8s.io/kubernetes/pkg/kubelet/cm" | ||||||
| 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/server/portforward" | 	"k8s.io/kubernetes/pkg/kubelet/server/portforward" | ||||||
|   | |||||||
| @@ -46,10 +46,10 @@ import ( | |||||||
| 	"k8s.io/apimachinery/pkg/util/sets" | 	"k8s.io/apimachinery/pkg/util/sets" | ||||||
| 	"k8s.io/apiserver/pkg/authentication/user" | 	"k8s.io/apiserver/pkg/authentication/user" | ||||||
| 	"k8s.io/apiserver/pkg/authorization/authorizer" | 	"k8s.io/apiserver/pkg/authorization/authorizer" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	utiltesting "k8s.io/client-go/util/testing" | 	utiltesting "k8s.io/client-go/util/testing" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/cm" | 	"k8s.io/kubernetes/pkg/kubelet/cm" | ||||||
| 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" | ||||||
| 	kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing" | 	kubecontainertesting "k8s.io/kubernetes/pkg/kubelet/container/testing" | ||||||
|   | |||||||
| @@ -17,7 +17,6 @@ go_library( | |||||||
|     ], |     ], | ||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", |         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", | ||||||
|         "//pkg/kubelet/server/portforward:go_default_library", |         "//pkg/kubelet/server/portforward:go_default_library", | ||||||
|         "//pkg/kubelet/server/remotecommand:go_default_library", |         "//pkg/kubelet/server/remotecommand:go_default_library", | ||||||
| @@ -26,6 +25,7 @@ go_library( | |||||||
|         "//vendor/google.golang.org/grpc/codes:go_default_library", |         "//vendor/google.golang.org/grpc/codes:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/clock:go_default_library", |         "//vendor/k8s.io/client-go/util/clock:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
| @@ -40,13 +40,13 @@ go_test( | |||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api:go_default_library", |         "//pkg/api:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", |         "//pkg/kubelet/apis/cri/v1alpha1:go_default_library", | ||||||
|         "//pkg/kubelet/server/portforward:go_default_library", |         "//pkg/kubelet/server/portforward:go_default_library", | ||||||
|         "//vendor/github.com/stretchr/testify/assert:go_default_library", |         "//vendor/github.com/stretchr/testify/assert:go_default_library", | ||||||
|         "//vendor/github.com/stretchr/testify/require:go_default_library", |         "//vendor/github.com/stretchr/testify/require:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/rest:go_default_library", |         "//vendor/k8s.io/client-go/rest:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/util/clock:go_default_library", |         "//vendor/k8s.io/client-go/util/clock:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ import ( | |||||||
|  |  | ||||||
| 	"k8s.io/apimachinery/pkg/types" | 	"k8s.io/apimachinery/pkg/types" | ||||||
| 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | ||||||
| 	"k8s.io/kubernetes/pkg/kubelet/server/portforward" | 	"k8s.io/kubernetes/pkg/kubelet/server/portforward" | ||||||
| 	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" | 	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand" | ||||||
|   | |||||||
| @@ -32,8 +32,8 @@ import ( | |||||||
|  |  | ||||||
| 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
| 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1" | ||||||
| 	kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward" | 	kubeletportforward "k8s.io/kubernetes/pkg/kubelet/server/portforward" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -19,11 +19,11 @@ go_library( | |||||||
|     ], |     ], | ||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/util/interrupt:go_default_library", |         "//pkg/util/interrupt:go_default_library", | ||||||
|         "//vendor/github.com/docker/docker/pkg/term:go_default_library", |         "//vendor/github.com/docker/docker/pkg/term:go_default_library", | ||||||
|         "//vendor/github.com/mitchellh/go-wordwrap:go_default_library", |         "//vendor/github.com/mitchellh/go-wordwrap:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ import ( | |||||||
|  |  | ||||||
| 	"github.com/docker/docker/pkg/term" | 	"github.com/docker/docker/pkg/term" | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // GetSize returns the current size of the user's terminal. If it isn't a terminal, | // GetSize returns the current size of the user's terminal. If it isn't a terminal, | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ import ( | |||||||
| 	"syscall" | 	"syscall" | ||||||
|  |  | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // monitorResizeEvents spawns a goroutine that waits for SIGWINCH signals (these indicate the | // monitorResizeEvents spawns a goroutine that waits for SIGWINCH signals (these indicate the | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ import ( | |||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // monitorResizeEvents spawns a goroutine that periodically gets the terminal size and tries to send | // monitorResizeEvents spawns a goroutine that periodically gets the terminal size and tries to send | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ package term | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"github.com/docker/docker/pkg/term" | 	"github.com/docker/docker/pkg/term" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // SetSize sets the terminal size associated with fd. | // SetSize sets the terminal size associated with fd. | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ limitations under the License. | |||||||
| package term | package term | ||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| func SetSize(fd uintptr, size remotecommand.TerminalSize) error { | func SetSize(fd uintptr, size remotecommand.TerminalSize) error { | ||||||
|   | |||||||
							
								
								
									
										22
									
								
								staging/src/k8s.io/client-go/Godeps/Godeps.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										22
									
								
								staging/src/k8s.io/client-go/Godeps/Godeps.json
									
									
									
										generated
									
									
									
								
							| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
| 	"ImportPath": "k8s.io/client-go", | 	"ImportPath": "k8s.io/client-go", | ||||||
| 	"GoVersion": "go1.8", | 	"GoVersion": "go1.7", | ||||||
| 	"GodepVersion": "v79", | 	"GodepVersion": "v79", | ||||||
| 	"Packages": [ | 	"Packages": [ | ||||||
| 		"./..." | 		"./..." | ||||||
| @@ -66,6 +66,14 @@ | |||||||
| 			"ImportPath": "github.com/docker/distribution/reference", | 			"ImportPath": "github.com/docker/distribution/reference", | ||||||
| 			"Rev": "cd27f179f2c10c5d300e6d09025b538c475b0d51" | 			"Rev": "cd27f179f2c10c5d300e6d09025b538c475b0d51" | ||||||
| 		}, | 		}, | ||||||
|  | 		{ | ||||||
|  | 			"ImportPath": "github.com/docker/spdystream", | ||||||
|  | 			"Rev": "449fdfce4d962303d702fec724ef0ad181c92528" | ||||||
|  | 		}, | ||||||
|  | 		{ | ||||||
|  | 			"ImportPath": "github.com/docker/spdystream/spdy", | ||||||
|  | 			"Rev": "449fdfce4d962303d702fec724ef0ad181c92528" | ||||||
|  | 		}, | ||||||
| 		{ | 		{ | ||||||
| 			"ImportPath": "github.com/emicklei/go-restful", | 			"ImportPath": "github.com/emicklei/go-restful", | ||||||
| 			"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" | 			"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46" | ||||||
| @@ -390,6 +398,10 @@ | |||||||
| 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", | 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", | ||||||
| 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
| 		}, | 		}, | ||||||
|  | 		{ | ||||||
|  | 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", | ||||||
|  | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
|  | 		}, | ||||||
| 		{ | 		{ | ||||||
| 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", | 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", | ||||||
| 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
| @@ -410,6 +422,10 @@ | |||||||
| 			"ImportPath": "k8s.io/apimachinery/pkg/util/rand", | 			"ImportPath": "k8s.io/apimachinery/pkg/util/rand", | ||||||
| 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
| 		}, | 		}, | ||||||
|  | 		{ | ||||||
|  | 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", | ||||||
|  | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
|  | 		}, | ||||||
| 		{ | 		{ | ||||||
| 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", | 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", | ||||||
| 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
| @@ -450,6 +466,10 @@ | |||||||
| 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", | 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", | ||||||
| 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
| 		}, | 		}, | ||||||
|  | 		{ | ||||||
|  | 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", | ||||||
|  | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
|  | 		}, | ||||||
| 		{ | 		{ | ||||||
| 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", | 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", | ||||||
| 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | 			"Rev": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" | ||||||
|   | |||||||
| @@ -8,6 +8,21 @@ load( | |||||||
|     "go_test", |     "go_test", | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | go_test( | ||||||
|  |     name = "go_default_test", | ||||||
|  |     srcs = [ | ||||||
|  |         "v2_test.go", | ||||||
|  |         "v4_test.go", | ||||||
|  |     ], | ||||||
|  |     library = ":go_default_library", | ||||||
|  |     tags = ["automanaged"], | ||||||
|  |     deps = [ | ||||||
|  |         "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", | ||||||
|  |         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", | ||||||
|  |     ], | ||||||
|  | ) | ||||||
|  | 
 | ||||||
| go_library( | go_library( | ||||||
|     name = "go_default_library", |     name = "go_default_library", | ||||||
|     srcs = [ |     srcs = [ | ||||||
| @@ -22,43 +37,15 @@ go_library( | |||||||
|     ], |     ], | ||||||
|     tags = ["automanaged"], |     tags = ["automanaged"], | ||||||
|     deps = [ |     deps = [ | ||||||
|         "//pkg/api:go_default_library", |  | ||||||
|         "//pkg/util/exec:go_default_library", |  | ||||||
|         "//vendor/github.com/golang/glog:go_default_library", |         "//vendor/github.com/golang/glog:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", |         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/rest:go_default_library", |         "//vendor/k8s.io/client-go/rest:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/transport:go_default_library", |         "//vendor/k8s.io/client-go/transport:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/util/exec:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
| 
 |  | ||||||
| go_test( |  | ||||||
|     name = "go_default_test", |  | ||||||
|     srcs = [ |  | ||||||
|         "v2_test.go", |  | ||||||
|         "v4_test.go", |  | ||||||
|     ], |  | ||||||
|     library = ":go_default_library", |  | ||||||
|     tags = ["automanaged"], |  | ||||||
|     deps = [ |  | ||||||
|         "//pkg/api:go_default_library", |  | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", |  | ||||||
|         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", |  | ||||||
|     ], |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| filegroup( |  | ||||||
|     name = "package-srcs", |  | ||||||
|     srcs = glob(["**"]), |  | ||||||
|     tags = ["automanaged"], |  | ||||||
|     visibility = ["//visibility:private"], |  | ||||||
| ) |  | ||||||
| 
 |  | ||||||
| filegroup( |  | ||||||
|     name = "all-srcs", |  | ||||||
|     srcs = [":package-srcs"], |  | ||||||
|     tags = ["automanaged"], |  | ||||||
| ) |  | ||||||
| @@ -17,4 +17,4 @@ limitations under the License. | |||||||
| // Package remotecommand adds support for executing commands in containers, | // Package remotecommand adds support for executing commands in containers, | ||||||
| // with support for separate stdin, stdout, and stderr streams, as well as | // with support for separate stdin, stdout, and stderr streams, as well as | ||||||
| // TTY. | // TTY. | ||||||
| package remotecommand // import "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" | package remotecommand // import "k8s.io/client-go/tools/remotecommand" | ||||||
| @@ -24,7 +24,7 @@ import ( | |||||||
| 
 | 
 | ||||||
| 	"github.com/golang/glog" | 	"github.com/golang/glog" | ||||||
| 	"k8s.io/apimachinery/pkg/util/httpstream" | 	"k8s.io/apimachinery/pkg/util/httpstream" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/client-go/pkg/api/v1" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // streamProtocolV1 implements the first version of the streaming exec & attach | // streamProtocolV1 implements the first version of the streaming exec & attach | ||||||
| @@ -58,7 +58,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 		if _, err := io.Copy(dst, src); err != nil && err != io.EOF { | 		if _, err := io.Copy(dst, src); err != nil && err != io.EOF { | ||||||
| 			glog.Errorf("Error copying %s: %v", s, err) | 			glog.Errorf("Error copying %s: %v", s, err) | ||||||
| 		} | 		} | ||||||
| 		if s == api.StreamTypeStdout || s == api.StreamTypeStderr { | 		if s == v1.StreamTypeStdout || s == v1.StreamTypeStderr { | ||||||
| 			doneChan <- struct{}{} | 			doneChan <- struct{}{} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -66,7 +66,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 	// set up all the streams first | 	// set up all the streams first | ||||||
| 	var err error | 	var err error | ||||||
| 	headers := http.Header{} | 	headers := http.Header{} | ||||||
| 	headers.Set(api.StreamType, api.StreamTypeError) | 	headers.Set(v1.StreamType, v1.StreamTypeError) | ||||||
| 	p.errorStream, err = conn.CreateStream(headers) | 	p.errorStream, err = conn.CreateStream(headers) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return err | 		return err | ||||||
| @@ -81,7 +81,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 	// gets all the streams. By creating all the streams first, we ensure that the server is ready to | 	// gets all the streams. By creating all the streams first, we ensure that the server is ready to | ||||||
| 	// process data before the client starts sending any. See https://issues.k8s.io/16373 for more info. | 	// process data before the client starts sending any. See https://issues.k8s.io/16373 for more info. | ||||||
| 	if p.Stdin != nil { | 	if p.Stdin != nil { | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeStdin) | 		headers.Set(v1.StreamType, v1.StreamTypeStdin) | ||||||
| 		p.remoteStdin, err = conn.CreateStream(headers) | 		p.remoteStdin, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| @@ -90,7 +90,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if p.Stdout != nil { | 	if p.Stdout != nil { | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeStdout) | 		headers.Set(v1.StreamType, v1.StreamTypeStdout) | ||||||
| 		p.remoteStdout, err = conn.CreateStream(headers) | 		p.remoteStdout, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| @@ -99,7 +99,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if p.Stderr != nil && !p.Tty { | 	if p.Stderr != nil && !p.Tty { | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeStderr) | 		headers.Set(v1.StreamType, v1.StreamTypeStderr) | ||||||
| 		p.remoteStderr, err = conn.CreateStream(headers) | 		p.remoteStderr, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| @@ -127,7 +127,7 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 		// because stdin is not closed until the process exits. If we try to call | 		// because stdin is not closed until the process exits. If we try to call | ||||||
| 		// stdin.Close(), it returns no error but doesn't unblock the copy. It will | 		// stdin.Close(), it returns no error but doesn't unblock the copy. It will | ||||||
| 		// exit when the process exits, instead. | 		// exit when the process exits, instead. | ||||||
| 		go cp(api.StreamTypeStdin, p.remoteStdin, p.Stdin) | 		go cp(v1.StreamTypeStdin, p.remoteStdin, p.Stdin) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	waitCount := 0 | 	waitCount := 0 | ||||||
| @@ -135,12 +135,12 @@ func (p *streamProtocolV1) stream(conn streamCreator) error { | |||||||
| 
 | 
 | ||||||
| 	if p.Stdout != nil { | 	if p.Stdout != nil { | ||||||
| 		waitCount++ | 		waitCount++ | ||||||
| 		go cp(api.StreamTypeStdout, p.Stdout, p.remoteStdout) | 		go cp(v1.StreamTypeStdout, p.Stdout, p.remoteStdout) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if p.Stderr != nil && !p.Tty { | 	if p.Stderr != nil && !p.Tty { | ||||||
| 		waitCount++ | 		waitCount++ | ||||||
| 		go cp(api.StreamTypeStderr, p.Stderr, p.remoteStderr) | 		go cp(v1.StreamTypeStderr, p.Stderr, p.remoteStderr) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| Loop: | Loop: | ||||||
| @@ -24,7 +24,7 @@ import ( | |||||||
| 	"sync" | 	"sync" | ||||||
| 
 | 
 | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/client-go/pkg/api/v1" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // streamProtocolV2 implements version 2 of the streaming protocol for attach | // streamProtocolV2 implements version 2 of the streaming protocol for attach | ||||||
| @@ -53,7 +53,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error { | |||||||
| 	headers := http.Header{} | 	headers := http.Header{} | ||||||
| 
 | 
 | ||||||
| 	// set up error stream | 	// set up error stream | ||||||
| 	headers.Set(api.StreamType, api.StreamTypeError) | 	headers.Set(v1.StreamType, v1.StreamTypeError) | ||||||
| 	p.errorStream, err = conn.CreateStream(headers) | 	p.errorStream, err = conn.CreateStream(headers) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		return err | 		return err | ||||||
| @@ -61,7 +61,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error { | |||||||
| 
 | 
 | ||||||
| 	// set up stdin stream | 	// set up stdin stream | ||||||
| 	if p.Stdin != nil { | 	if p.Stdin != nil { | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeStdin) | 		headers.Set(v1.StreamType, v1.StreamTypeStdin) | ||||||
| 		p.remoteStdin, err = conn.CreateStream(headers) | 		p.remoteStdin, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| @@ -70,7 +70,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error { | |||||||
| 
 | 
 | ||||||
| 	// set up stdout stream | 	// set up stdout stream | ||||||
| 	if p.Stdout != nil { | 	if p.Stdout != nil { | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeStdout) | 		headers.Set(v1.StreamType, v1.StreamTypeStdout) | ||||||
| 		p.remoteStdout, err = conn.CreateStream(headers) | 		p.remoteStdout, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| @@ -79,7 +79,7 @@ func (p *streamProtocolV2) createStreams(conn streamCreator) error { | |||||||
| 
 | 
 | ||||||
| 	// set up stderr stream | 	// set up stderr stream | ||||||
| 	if p.Stderr != nil && !p.Tty { | 	if p.Stderr != nil && !p.Tty { | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeStderr) | 		headers.Set(v1.StreamType, v1.StreamTypeStderr) | ||||||
| 		p.remoteStderr, err = conn.CreateStream(headers) | 		p.remoteStderr, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			return err | 			return err | ||||||
| @@ -26,7 +26,7 @@ import ( | |||||||
| 
 | 
 | ||||||
| 	"k8s.io/apimachinery/pkg/util/httpstream" | 	"k8s.io/apimachinery/pkg/util/httpstream" | ||||||
| 	"k8s.io/apimachinery/pkg/util/wait" | 	"k8s.io/apimachinery/pkg/util/wait" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/client-go/pkg/api/v1" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| type fakeReader struct { | type fakeReader struct { | ||||||
| @@ -47,7 +47,7 @@ type fakeStreamCreator struct { | |||||||
| var _ streamCreator = &fakeStreamCreator{} | var _ streamCreator = &fakeStreamCreator{} | ||||||
| 
 | 
 | ||||||
| func (f *fakeStreamCreator) CreateStream(headers http.Header) (httpstream.Stream, error) { | func (f *fakeStreamCreator) CreateStream(headers http.Header) (httpstream.Stream, error) { | ||||||
| 	streamType := headers.Get(api.StreamType) | 	streamType := headers.Get(v1.StreamType) | ||||||
| 	f.created[streamType] = true | 	f.created[streamType] = true | ||||||
| 	return nil, f.errors[streamType] | 	return nil, f.errors[streamType] | ||||||
| } | } | ||||||
| @@ -111,10 +111,10 @@ func TestV2CreateStreams(t *testing.T) { | |||||||
| 		conn := &fakeStreamCreator{ | 		conn := &fakeStreamCreator{ | ||||||
| 			created: make(map[string]bool), | 			created: make(map[string]bool), | ||||||
| 			errors: map[string]error{ | 			errors: map[string]error{ | ||||||
| 				api.StreamTypeStdin:  test.stdinError, | 				v1.StreamTypeStdin:  test.stdinError, | ||||||
| 				api.StreamTypeStdout: test.stdoutError, | 				v1.StreamTypeStdout: test.stdoutError, | ||||||
| 				api.StreamTypeStderr: test.stderrError, | 				v1.StreamTypeStderr: test.stderrError, | ||||||
| 				api.StreamTypeError:  test.errorError, | 				v1.StreamTypeError:  test.errorError, | ||||||
| 			}, | 			}, | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| @@ -157,20 +157,20 @@ func TestV2CreateStreams(t *testing.T) { | |||||||
| 			continue | 			continue | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		if test.stdin && !conn.created[api.StreamTypeStdin] { | 		if test.stdin && !conn.created[v1.StreamTypeStdin] { | ||||||
| 			t.Errorf("%s: expected stdin stream", test.name) | 			t.Errorf("%s: expected stdin stream", test.name) | ||||||
| 		} | 		} | ||||||
| 		if test.stdout && !conn.created[api.StreamTypeStdout] { | 		if test.stdout && !conn.created[v1.StreamTypeStdout] { | ||||||
| 			t.Errorf("%s: expected stdout stream", test.name) | 			t.Errorf("%s: expected stdout stream", test.name) | ||||||
| 		} | 		} | ||||||
| 		if test.stderr { | 		if test.stderr { | ||||||
| 			if test.tty && conn.created[api.StreamTypeStderr] { | 			if test.tty && conn.created[v1.StreamTypeStderr] { | ||||||
| 				t.Errorf("%s: unexpected stderr stream because tty is set", test.name) | 				t.Errorf("%s: unexpected stderr stream because tty is set", test.name) | ||||||
| 			} else if !test.tty && !conn.created[api.StreamTypeStderr] { | 			} else if !test.tty && !conn.created[v1.StreamTypeStderr] { | ||||||
| 				t.Errorf("%s: expected stderr stream", test.name) | 				t.Errorf("%s: expected stderr stream", test.name) | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 		if !conn.created[api.StreamTypeError] { | 		if !conn.created[v1.StreamTypeError] { | ||||||
| 			t.Errorf("%s: expected error stream", test.name) | 			t.Errorf("%s: expected error stream", test.name) | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| @@ -23,7 +23,7 @@ import ( | |||||||
| 	"sync" | 	"sync" | ||||||
| 
 | 
 | ||||||
| 	"k8s.io/apimachinery/pkg/util/runtime" | 	"k8s.io/apimachinery/pkg/util/runtime" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/client-go/pkg/api/v1" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // streamProtocolV3 implements version 3 of the streaming protocol for attach | // streamProtocolV3 implements version 3 of the streaming protocol for attach | ||||||
| @@ -51,7 +51,7 @@ func (p *streamProtocolV3) createStreams(conn streamCreator) error { | |||||||
| 	// set up resize stream | 	// set up resize stream | ||||||
| 	if p.Tty { | 	if p.Tty { | ||||||
| 		headers := http.Header{} | 		headers := http.Header{} | ||||||
| 		headers.Set(api.StreamType, api.StreamTypeResize) | 		headers.Set(v1.StreamType, v1.StreamTypeResize) | ||||||
| 		var err error | 		var err error | ||||||
| 		p.resizeStream, err = conn.CreateStream(headers) | 		p.resizeStream, err = conn.CreateStream(headers) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| @@ -25,7 +25,7 @@ import ( | |||||||
| 
 | 
 | ||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	"k8s.io/apimachinery/pkg/util/remotecommand" | 	"k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/util/exec" | 	"k8s.io/client-go/util/exec" | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
| // streamProtocolV4 implements version 4 of the streaming protocol for attach | // streamProtocolV4 implements version 4 of the streaming protocol for attach | ||||||
							
								
								
									
										14
									
								
								staging/src/k8s.io/client-go/util/exec/BUILD
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								staging/src/k8s.io/client-go/util/exec/BUILD
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | |||||||
|  | package(default_visibility = ["//visibility:public"]) | ||||||
|  |  | ||||||
|  | licenses(["notice"]) | ||||||
|  |  | ||||||
|  | load( | ||||||
|  |     "@io_bazel_rules_go//go:def.bzl", | ||||||
|  |     "go_library", | ||||||
|  | ) | ||||||
|  |  | ||||||
|  | go_library( | ||||||
|  |     name = "go_default_library", | ||||||
|  |     srcs = ["exec.go"], | ||||||
|  |     tags = ["automanaged"], | ||||||
|  | ) | ||||||
							
								
								
									
										52
									
								
								staging/src/k8s.io/client-go/util/exec/exec.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								staging/src/k8s.io/client-go/util/exec/exec.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,52 @@ | |||||||
|  | /* | ||||||
|  | Copyright 2014 The Kubernetes Authors. | ||||||
|  |  | ||||||
|  | Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
|  | you may not use this file except in compliance with the License. | ||||||
|  | You may obtain a copy of the License at | ||||||
|  |  | ||||||
|  |     http://www.apache.org/licenses/LICENSE-2.0 | ||||||
|  |  | ||||||
|  | Unless required by applicable law or agreed to in writing, software | ||||||
|  | distributed under the License is distributed on an "AS IS" BASIS, | ||||||
|  | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
|  | See the License for the specific language governing permissions and | ||||||
|  | limitations under the License. | ||||||
|  | */ | ||||||
|  |  | ||||||
|  | package exec | ||||||
|  |  | ||||||
|  | // ExitError is an interface that presents an API similar to os.ProcessState, which is | ||||||
|  | // what ExitError from os/exec is.  This is designed to make testing a bit easier and | ||||||
|  | // probably loses some of the cross-platform properties of the underlying library. | ||||||
|  | type ExitError interface { | ||||||
|  | 	String() string | ||||||
|  | 	Error() string | ||||||
|  | 	Exited() bool | ||||||
|  | 	ExitStatus() int | ||||||
|  | } | ||||||
|  |  | ||||||
|  | // CodeExitError is an implementation of ExitError consisting of an error object | ||||||
|  | // and an exit code (the upper bits of os.exec.ExitStatus). | ||||||
|  | type CodeExitError struct { | ||||||
|  | 	Err  error | ||||||
|  | 	Code int | ||||||
|  | } | ||||||
|  |  | ||||||
|  | var _ ExitError = CodeExitError{} | ||||||
|  |  | ||||||
|  | func (e CodeExitError) Error() string { | ||||||
|  | 	return e.Err.Error() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (e CodeExitError) String() string { | ||||||
|  | 	return e.Err.Error() | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (e CodeExitError) Exited() bool { | ||||||
|  | 	return true | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func (e CodeExitError) ExitStatus() int { | ||||||
|  | 	return e.Code | ||||||
|  | } | ||||||
| @@ -60,7 +60,6 @@ go_library( | |||||||
|         "//pkg/client/clientset_generated/internalclientset:go_default_library", |         "//pkg/client/clientset_generated/internalclientset:go_default_library", | ||||||
|         "//pkg/client/conditions:go_default_library", |         "//pkg/client/conditions:go_default_library", | ||||||
|         "//pkg/client/retry:go_default_library", |         "//pkg/client/retry:go_default_library", | ||||||
|         "//pkg/client/unversioned/remotecommand:go_default_library", |  | ||||||
|         "//pkg/cloudprovider:go_default_library", |         "//pkg/cloudprovider:go_default_library", | ||||||
|         "//pkg/cloudprovider/providers/aws:go_default_library", |         "//pkg/cloudprovider/providers/aws:go_default_library", | ||||||
|         "//pkg/cloudprovider/providers/azure:go_default_library", |         "//pkg/cloudprovider/providers/azure:go_default_library", | ||||||
| @@ -131,6 +130,7 @@ go_library( | |||||||
|         "//vendor/k8s.io/client-go/rest:go_default_library", |         "//vendor/k8s.io/client-go/rest:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", |         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", | ||||||
|         "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", |         "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", | ||||||
|  |         "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library", | ||||||
|     ], |     ], | ||||||
| ) | ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -25,9 +25,9 @@ import ( | |||||||
| 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||||||
| 	remocommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | 	remocommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" | ||||||
| 	restclient "k8s.io/client-go/rest" | 	restclient "k8s.io/client-go/rest" | ||||||
|  | 	"k8s.io/client-go/tools/remotecommand" | ||||||
| 	"k8s.io/kubernetes/pkg/api" | 	"k8s.io/kubernetes/pkg/api" | ||||||
| 	"k8s.io/kubernetes/pkg/api/v1" | 	"k8s.io/kubernetes/pkg/api/v1" | ||||||
| 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand" |  | ||||||
|  |  | ||||||
| 	. "github.com/onsi/gomega" | 	. "github.com/onsi/gomega" | ||||||
| ) | ) | ||||||
|   | |||||||
| @@ -655,7 +655,6 @@ k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1,jszczepkowski,1, | |||||||
| k8s.io/kubernetes/pkg/client/retry,caesarxuchao,1, | k8s.io/kubernetes/pkg/client/retry,caesarxuchao,1, | ||||||
| k8s.io/kubernetes/pkg/client/tests,Q-Lee,1, | k8s.io/kubernetes/pkg/client/tests,Q-Lee,1, | ||||||
| k8s.io/kubernetes/pkg/client/unversioned,justinsb,1, | k8s.io/kubernetes/pkg/client/unversioned,justinsb,1, | ||||||
| k8s.io/kubernetes/pkg/client/unversioned/remotecommand,rrati,0, |  | ||||||
| k8s.io/kubernetes/pkg/cloudprovider/providers/aws,eparis,1, | k8s.io/kubernetes/pkg/cloudprovider/providers/aws,eparis,1, | ||||||
| k8s.io/kubernetes/pkg/cloudprovider/providers/azure,saad-ali,1, | k8s.io/kubernetes/pkg/cloudprovider/providers/azure,saad-ali,1, | ||||||
| k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack,roberthbailey,1, | k8s.io/kubernetes/pkg/cloudprovider/providers/cloudstack,roberthbailey,1, | ||||||
|   | |||||||
| 
 | 
		Reference in New Issue
	
	Block a user
	 Kubernetes Submit Queue
					Kubernetes Submit Queue