Merge pull request #422 from galal-hussein/use_cni_with_docker

Add cni plugin to kubelet if docker is used
k3s-io · May 2, 2019 · 4ec051d · 4ec051d
2 parents 9005fd5 + 191ac93
commit 4ec051d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/pkg/agent/run.go b/pkg/agent/run.go
@@ -33,6 +33,7 @@ func run(ctx context.Context, cfg cmds.Agent) error {
 
 	if nodeConfig.Docker || nodeConfig.ContainerRuntimeEndpoint != "" {
 		nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.ContainerRuntimeEndpoint
+		nodeConfig.AgentConfig.CNIPlugin = true
 	} else {
 		if err := containerd.Run(ctx, nodeConfig); err != nil {
 			return err

diff --git a/pkg/daemons/agent/agent.go b/pkg/daemons/agent/agent.go
@@ -78,6 +78,9 @@ func kubelet(cfg *config.Agent) {
 	if cfg.CNIBinDir != "" {
 		argsMap["cni-bin-dir"] = cfg.CNIBinDir
 	}
+	if cfg.CNIPlugin {
+		argsMap["network-plugin"] = "cni"
+	}
 	if len(cfg.ClusterDNS) > 0 {
 		argsMap["cluster-dns"] = cfg.ClusterDNS.String()
 	}

diff --git a/pkg/daemons/config/types.go b/pkg/daemons/config/types.go
@@ -53,6 +53,7 @@ type Agent struct {
 	CNIConfDir         string
 	ExtraKubeletArgs   []string
 	ExtraKubeProxyArgs []string
+	CNIPlugin          bool
 }
 
 type Control struct {