Merge pull request #336 from liyanyanli/k8sv1.11

Fix: Upgrade vendored to v1.11.0

cmd/frakti/frakti.go

@@ -34,7 +34,7 @@ import (
 )
 
 const (
-	fraktiVersion = "1.10.0"
+	fraktiVersion = "1.11.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.10.*` works with Kubernetes `v1.10.*`, 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.11.*` works with Kubernetes `v1.11.*`, 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.10.0/frakti -o /usr/bin/frakti
+curl -sSL https://github.com/kubernetes/frakti/releases/download/v1.11.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,7 +24,6 @@ import (
 
 	"k8s.io/frakti/pkg/util/alternativeruntime"
 	"k8s.io/kubernetes/cmd/kubelet/app/options"
-	"k8s.io/kubernetes/pkg/kubelet"
 	"k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
 	kubeletconfiginternal "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig"
 	kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme"
@@ -77,15 +76,13 @@ 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),
-		NonMasqueradeCIDR: nonMasqueradeCIDR,
-		PluginName:        networkPluginName,
-		PluginConfDir:     cniNetDir,
-		PluginBinDir:      cniPluginDir,
-		MTU:               networkPluginMTU,
+		HairpinMode:        kubeletconfiginternal.HairpinMode(kubeCfg.HairpinMode),
+		NonMasqueradeCIDR:  nonMasqueradeCIDR,
+		PluginName:         networkPluginName,
+		PluginConfDir:      cniNetDir,
+		PluginBinDirString: cniPluginDir,
+		MTU:                networkPluginMTU,
 	}
-	var nl *kubelet.NoOpLegacyHost
-	pluginSettings.LegacyRuntimeHost = nl
 
 	if len(podSandboxImage) != 0 {
 		crOption.PodSandboxImage = podSandboxImage
@@ -101,7 +98,7 @@ func NewPrivilegedRuntimeService(privilegedRuntimeEndpoint string, streamingConf
 		// If dockershim detected this cgroupDriver is different with dockerd, it will fail.
 		cgroupDriver,
 		privilegedRuntimeRootDir,
-		true,
+		true, false,
 	)
 	if err != nil {
 		return nil, err