From dc0f3ce05c00d226ee9ef043fcc318703b5c389b Mon Sep 17 00:00:00 2001 From: yanxuean Date: Tue, 24 Oct 2017 15:21:55 +0800 Subject: [PATCH 1/2] remove redendancy code for cni Signed-off-by: yanxuean --- cmd/kubelet/app/server.go | 3 +-- pkg/kubelet/kubelet.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index e33cf687a97..480ed311aa5 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -897,14 +897,13 @@ func RunDockershim(f *options.KubeletFlags, c *kubeletconfiginternal.KubeletConf r.ImagePullProgressDeadline.Duration) // Initialize network plugin settings. - binDir := r.CNIBinDir nh := &kubelet.NoOpLegacyHost{} pluginSettings := dockershim.NetworkPluginSettings{ HairpinMode: kubeletconfiginternal.HairpinMode(c.HairpinMode), NonMasqueradeCIDR: f.NonMasqueradeCIDR, PluginName: r.NetworkPluginName, PluginConfDir: r.CNIConfDir, - PluginBinDir: binDir, + PluginBinDir: r.CNIBinDir, MTU: int(r.NetworkPluginMTU), LegacyRuntimeHost: nh, } diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 6662772c32e..aa60f12b33c 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -574,13 +574,12 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration, } // TODO: These need to become arguments to a standalone docker shim. - binDir := crOptions.CNIBinDir pluginSettings := dockershim.NetworkPluginSettings{ HairpinMode: hairpinMode, NonMasqueradeCIDR: nonMasqueradeCIDR, PluginName: crOptions.NetworkPluginName, PluginConfDir: crOptions.CNIConfDir, - PluginBinDir: binDir, + PluginBinDir: crOptions.CNIBinDir, MTU: int(crOptions.NetworkPluginMTU), } From 988694ff62d98769b42bc7a4f42221af35617165 Mon Sep 17 00:00:00 2001 From: yanxuean Date: Tue, 24 Oct 2017 15:30:13 +0800 Subject: [PATCH 2/2] error log message in buildCNIRuntimeConf Signed-off-by: yanxuean --- pkg/kubelet/network/cni/cni.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/network/cni/cni.go b/pkg/kubelet/network/cni/cni.go index 0ae1edc801d..6bb8ed3d47d 100644 --- a/pkg/kubelet/network/cni/cni.go +++ b/pkg/kubelet/network/cni/cni.go @@ -324,7 +324,7 @@ func (plugin *cniNetworkPlugin) deleteFromNetwork(network *cniNetwork, podName s func (plugin *cniNetworkPlugin) buildCNIRuntimeConf(podName string, podNs string, podSandboxID kubecontainer.ContainerID, podNetnsPath string) (*libcni.RuntimeConf, error) { glog.V(4).Infof("Got netns path %v", podNetnsPath) - glog.V(4).Infof("Using netns path %v", podNs) + glog.V(4).Infof("Using podns path %v", podNs) rt := &libcni.RuntimeConf{ ContainerID: podSandboxID.ID,