Merge pull request #345 from liyanyanli/v1.12.0

Fix: Upgrade vendored to v1.12.0

.travis.yml

@@ -10,7 +10,7 @@ env:
         - DOCKER_VERSION=17.03.2~ce-0~ubuntu-xenial
 
 go:
-  - 1.9.x
+  - 1.10.x
 
 go_import_path: k8s.io/frakti
 

cmd/frakti/frakti.go

@@ -34,7 +34,7 @@ import (
 )
 
 const (
-	fraktiVersion = "1.11.0"
+	fraktiVersion = "1.12.0"
 
 	// use port 22522 for dockershim streaming
 	privilegedStreamingServerPort = "22522"

docs/deploy.md

@@ -84,10 +84,10 @@ systemctl start docker
 
 #### Install frakti
 
-Please note frakti has the same release version of Kubernetes, i.e. frakti `v1.11.*` works with Kubernetes `v1.11.*`, the `*` part does not matter. This doc will always use latest stable release of Kubernetes.
+Please note frakti has the same release version of Kubernetes, i.e. frakti `v1.12.*` works with Kubernetes `v1.12.*`, the `*` part does not matter. This doc will always use latest stable release of Kubernetes.
 
 ```sh
-curl -sSL https://github.com/kubernetes/frakti/releases/download/v1.11.0/frakti -o /usr/bin/frakti
+curl -sSL https://github.com/kubernetes/frakti/releases/download/v1.12.0/frakti -o /usr/bin/frakti
 chmod +x /usr/bin/frakti
 cgroup_driver=$(docker info | awk '/Cgroup Driver/{print $3}')
 cat <<EOF > /lib/systemd/system/frakti.service

pkg/docker/privilegedruntime.go

@@ -24,10 +24,9 @@ import (
 
 	"k8s.io/frakti/pkg/util/alternativeruntime"
 	"k8s.io/kubernetes/cmd/kubelet/app/options"
-	"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
-	kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
-	kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme"
-	kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1"
+	kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
+	kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/config"
+	kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim"
 	dockerremote "k8s.io/kubernetes/pkg/kubelet/dockershim/remote"
 	"k8s.io/kubernetes/pkg/kubelet/server/streaming"
@@ -58,7 +57,7 @@ func NewPrivilegedRuntimeService(privilegedRuntimeEndpoint string, streamingConf
 		return nil, err
 	}
 
-	external := &kubeletconfigv1beta1.KubeletConfiguration{}
+	external := &kubeletconfiginternal.KubeletConfiguration{}
 	kubeletScheme.Default(external)
 	kubeCfg := &kubeletconfig.KubeletConfiguration{}
 	if err := kubeletScheme.Convert(external, kubeCfg, nil); err != nil {
@@ -76,7 +75,8 @@ func NewPrivilegedRuntimeService(privilegedRuntimeEndpoint string, streamingConf
 	// NOTE(harry): pluginSettings should be arguments for dockershim, not part of kubelet.
 	// But standalone dockershim is not ready yet, so we use default values here.
 	pluginSettings := dockershim.NetworkPluginSettings{
-		HairpinMode:        kubeletconfiginternal.HairpinMode(kubeCfg.HairpinMode),
+		//HairpinMode:        kubeletconfiginternal.HairpinMode(kubeCfg.HairpinMode),
+		HairpinMode:        kubeletconfiginternal.HairpinMode(kubeletconfig.HairpinNone),
 		NonMasqueradeCIDR:  nonMasqueradeCIDR,
 		PluginName:         networkPluginName,
 		PluginConfDir:      cniNetDir,
@@ -98,7 +98,7 @@ func NewPrivilegedRuntimeService(privilegedRuntimeEndpoint string, streamingConf
 		// If dockershim detected this cgroupDriver is different with dockerd, it will fail.
 		cgroupDriver,
 		privilegedRuntimeRootDir,
-		true, false,
+		false,
 	)
 	if err != nil {
 		return nil, err

pkg/docker/runtime_service.go

@@ -213,7 +213,7 @@ func (p *PrivilegedRuntime) ReopenContainerLog(ContainerID string) error {
 }
 
 // RunPodSandbox creates and starts a pod-level sandbox.
-func (p *PrivilegedRuntime) RunPodSandbox(config *kubeapi.PodSandboxConfig) (string, error) {
+func (p *PrivilegedRuntime) RunPodSandbox(config *kubeapi.PodSandboxConfig, runtimeHandler string) (string, error) {
 	request := &kubeapi.RunPodSandboxRequest{Config: config}
 	logrus.Debugf("RunPodSandboxRequest: %v", request)
 	r, err := runtimeClient.RunPodSandbox(context.Background(), request)

pkg/hyper/sandbox.go

@@ -31,7 +31,7 @@ import (
 )
 
 // RunPodSandbox creates and starts a pod-level sandbox.
-func (h *Runtime) RunPodSandbox(config *kubeapi.PodSandboxConfig) (string, error) {
+func (h *Runtime) RunPodSandbox(config *kubeapi.PodSandboxConfig, runtimeHandler string) (string, error) {
 	userpod, err := h.buildUserPod(config)
 	if err != nil {
 		glog.Errorf("Build UserPod for sandbox %q failed: %v", config.String(), err)

pkg/manager/manager.go

@@ -210,7 +210,7 @@ func (s *FraktiManager) RunPodSandbox(ctx context.Context, req *kubeapi.RunPodSa
 
 	runtimeService := s.getRuntimeServiceBySandboxConfig(req.GetConfig())
 	runtimeName := runtimeService.ServiceName()
-	podID, err := runtimeService.RunPodSandbox(req.Config)
+	podID, err := runtimeService.RunPodSandbox(req.Config, "frakti")
 	if err != nil {
 		glog.Errorf("RunPodSandbox from %s failed: %v", runtimeName, err)
 		return nil, err

pkg/unikernel/service/sandbox.go

@@ -31,7 +31,7 @@ import (
 )
 
 // RunPodSandbox creates and starts a pod-level sandbox.
-func (u *UnikernelRuntime) RunPodSandbox(config *kubeapi.PodSandboxConfig) (string, error) {
+func (u *UnikernelRuntime) RunPodSandbox(config *kubeapi.PodSandboxConfig, runtimeHandler string) (string, error) {
 	var err error
 	// Genrate sandbox ID and name
 	podID := uuid.NewUUID()