*: initial update to kube 1.8

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

server/apparmor/apparmor_supported.go

@@ -11,7 +11,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker/utils/templates"
+	"github.com/docker/docker/pkg/templates"
 	"github.com/opencontainers/runc/libcontainer/apparmor"
 )
 

server/container_exec.go

@@ -13,8 +13,8 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	"k8s.io/kubernetes/pkg/util/term"
+	utilexec "k8s.io/utils/exec"
 )
 
 // Exec prepares a streaming endpoint to execute a command in the container.

server/container_update_resources.go

@@ -0,0 +1,13 @@
+package server
+
+import (
+	"fmt"
+
+	"golang.org/x/net/context"
+	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
+)
+
+// UpdateContainerResources updates ContainerConfig of the container.
+func (s *Server) UpdateContainerResources(ctx context.Context, req *pb.UpdateContainerResourcesRequest) (*pb.UpdateContainerResourcesResponse, error) {
+	return nil, fmt.Errorf("not implemented")
+}

server/sandbox_run.go

@@ -23,7 +23,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"golang.org/x/sys/unix"
-	"k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/api/core/v1"
 	pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 	"k8s.io/kubernetes/pkg/kubelet/leaky"
 	"k8s.io/kubernetes/pkg/kubelet/network/hostport"

server/server.go

@@ -30,8 +30,8 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
 	iptablesproxy "k8s.io/kubernetes/pkg/proxy/iptables"
 	utildbus "k8s.io/kubernetes/pkg/util/dbus"
-	utilexec "k8s.io/kubernetes/pkg/util/exec"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
+	utilexec "k8s.io/utils/exec"
 )
 
 const (
@@ -200,7 +200,7 @@ func New(config *Config) (*Server, error) {
 	}
 	iptInterface := utiliptables.New(utilexec.New(), utildbus.New(), utiliptables.ProtocolIpv4)
 	iptInterface.EnsureChain(utiliptables.TableNAT, iptablesproxy.KubeMarkMasqChain)
-	hostportManager := hostport.NewHostportManager()
+	hostportManager := hostport.NewHostportManager(iptInterface)
 
 	s := &Server{
 		ContainerServer: containerServer,