*: update kube vendor to latest master

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
cri-o · May 22, 2017 · c0b3f8c · c0b3f8c
1 parent fb83c7e
commit c0b3f8c
Show file tree

Hide file tree

Showing 10,579 changed files with 840,157 additions and 885,928 deletions.
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
@@ -17,7 +17,7 @@ import (
 	"github.com/opencontainers/selinux/go-selinux"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
-	"k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 const crioConfigPath = "/etc/crio/crio.conf"
@@ -304,8 +304,8 @@ func main() {
 
 		graceful := false
 		catchShutdown(s, service, &graceful)
-		runtime.RegisterRuntimeServiceServer(s, service)
-		runtime.RegisterImageServiceServer(s, service)
+		v1alpha1.RegisterRuntimeServiceServer(s, service)
+		v1alpha1.RegisterImageServiceServer(s, service)
 
 		// after the daemon is done setting up we can notify systemd api
 		notifySystem()

diff --git a/cmd/crioctl/container.go b/cmd/crioctl/container.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
+	remocommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
-	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
-	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/server/remotecommand"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 var containerCommand = cli.Command{
@@ -520,7 +520,7 @@ func Exec(client pb.RuntimeServiceClient, ID string, tty bool, stdin bool, urlOn
 	}
 
 	options := remotecommand.StreamOptions{
-		SupportedProtocols: remotecommandserver.SupportedStreamingProtocols,
+		SupportedProtocols: remocommandconsts.SupportedStreamingProtocols,
 		Stdout:             os.Stdout,
 		Stderr:             os.Stderr,
 		Tty:                tty,

diff --git a/cmd/crioctl/image.go b/cmd/crioctl/image.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
-	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 var imageCommand = cli.Command{

diff --git a/cmd/crioctl/main.go b/cmd/crioctl/main.go
@@ -10,7 +10,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
-	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 func getClientConnection(context *cli.Context) (*grpc.ClientConn, error) {

diff --git a/cmd/crioctl/sandbox.go b/cmd/crioctl/sandbox.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
-	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 var podSandboxCommand = cli.Command{
@@ -289,7 +289,6 @@ func PodSandboxStatus(client pb.RuntimeServiceClient, ID string) error {
 	fmt.Printf("Status: %s\n", r.Status.State)
 	ctm := time.Unix(0, r.Status.CreatedAt)
 	fmt.Printf("Created: %v\n", ctm)
-	fmt.Printf("Network namespace: %s\n", r.Status.Linux.Namespaces.Network)
 	if r.Status.Network != nil {
 		fmt.Printf("IP Address: %v\n", r.Status.Network.Ip)
 	}

diff --git a/cmd/crioctl/system.go b/cmd/crioctl/system.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/urfave/cli"
 	"golang.org/x/net/context"
-	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
 )
 
 var runtimeVersionCommand = cli.Command{