From 8b1174a3a79f520ba2f2ccdd3450e98b244bfa18 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Thu, 7 May 2015 23:36:47 -0700
Subject: [PATCH] kubelet/container: Move pty*.go to container runtime package.

This makes the labeld pty wrapper available for both container runtime.
---
 pkg/kubelet/{dockertools => container}/pty_linux.go       | 2 +-
 pkg/kubelet/{dockertools => container}/pty_unsupported.go | 2 +-
 pkg/kubelet/dockertools/manager.go                        | 2 +-
 pkg/kubelet/rkt/rkt.go                                    | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename pkg/kubelet/{dockertools => container}/pty_linux.go (97%)
 rename pkg/kubelet/{dockertools => container}/pty_unsupported.go (97%)

diff --git a/pkg/kubelet/dockertools/pty_linux.go b/pkg/kubelet/container/pty_linux.go
similarity index 97%
rename from pkg/kubelet/dockertools/pty_linux.go
rename to pkg/kubelet/container/pty_linux.go
index 6f4f971e70..cbc36f6d3f 100644
--- a/pkg/kubelet/dockertools/pty_linux.go
+++ b/pkg/kubelet/container/pty_linux.go
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package dockertools
+package container
 
 import (
 	"os"
diff --git a/pkg/kubelet/dockertools/pty_unsupported.go b/pkg/kubelet/container/pty_unsupported.go
similarity index 97%
rename from pkg/kubelet/dockertools/pty_unsupported.go
rename to pkg/kubelet/container/pty_unsupported.go
index 89e91087e5..b48a999b0a 100644
--- a/pkg/kubelet/dockertools/pty_unsupported.go
+++ b/pkg/kubelet/container/pty_unsupported.go
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package dockertools
+package container
 
 import (
 	"os"
diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go
index cea8c5e106..147607fc3e 100644
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -929,7 +929,7 @@ func (dm *DockerManager) ExecInContainer(containerId string, cmd []string, stdin
 	args = append(args, cmd...)
 	command := exec.Command(nsenter, args...)
 	if tty {
-		p, err := StartPty(command)
+		p, err := kubecontainer.StartPty(command)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go
index 1e289ab4a0..e54060116e 100644
--- a/pkg/kubelet/rkt/rkt.go
+++ b/pkg/kubelet/rkt/rkt.go
@@ -47,7 +47,6 @@ import (
 	"github.com/docker/docker/pkg/parsers"
 	docker "github.com/fsouza/go-dockerclient"
 	"github.com/golang/glog"
-	"github.com/kr/pty"
 )
 
 const (
@@ -928,8 +927,7 @@ func (r *runtime) ExecInContainer(containerID string, cmd []string, stdin io.Rea
 	command := r.buildCommand(args...)
 
 	if tty {
-		// TODO(yifan): Merge with dockertools.StartPty().
-		p, err := pty.Start(command)
+		p, err := kubecontainer.StartPty(command)
 		if err != nil {
 			return err
 		}