github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

remove redendancy code for cni

Browse Source 
Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
This commit is contained in:
yanxuean 2017-10-24 15:21:55 +08:00
parent e95672de45
commit dc0f3ce05c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubelet/app/server.go
View File

@ -897,14 +897,13 @@ func RunDockershim(f *options.KubeletFlags, c *kubeletconfiginternal.KubeletConf
r.ImagePullProgressDeadline.Duration) r.ImagePullProgressDeadline.Duration)
// Initialize network plugin settings. // Initialize network plugin settings.
binDir := r.CNIBinDir
nh := &kubelet.NoOpLegacyHost{} nh := &kubelet.NoOpLegacyHost{}
pluginSettings := dockershim.NetworkPluginSettings{ pluginSettings := dockershim.NetworkPluginSettings{
HairpinMode: kubeletconfiginternal.HairpinMode(c.HairpinMode), HairpinMode: kubeletconfiginternal.HairpinMode(c.HairpinMode),
NonMasqueradeCIDR: f.NonMasqueradeCIDR, NonMasqueradeCIDR: f.NonMasqueradeCIDR,
PluginName: r.NetworkPluginName, PluginName: r.NetworkPluginName,
PluginConfDir: r.CNIConfDir, PluginConfDir: r.CNIConfDir,
PluginBinDir: binDir, PluginBinDir: r.CNIBinDir,
MTU: int(r.NetworkPluginMTU), MTU: int(r.NetworkPluginMTU),
LegacyRuntimeHost: nh, LegacyRuntimeHost: nh,
} }

3
pkg/kubelet/kubelet.go
View File

@ -574,13 +574,12 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
} }
// TODO: These need to become arguments to a standalone docker shim. // TODO: These need to become arguments to a standalone docker shim.
binDir := crOptions.CNIBinDir
pluginSettings := dockershim.NetworkPluginSettings{ pluginSettings := dockershim.NetworkPluginSettings{
HairpinMode: hairpinMode, HairpinMode: hairpinMode,
NonMasqueradeCIDR: nonMasqueradeCIDR, NonMasqueradeCIDR: nonMasqueradeCIDR,
PluginName: crOptions.NetworkPluginName, PluginName: crOptions.NetworkPluginName,
PluginConfDir: crOptions.CNIConfDir, PluginConfDir: crOptions.CNIConfDir,
PluginBinDir: binDir, PluginBinDir: crOptions.CNIBinDir,
MTU: int(crOptions.NetworkPluginMTU), MTU: int(crOptions.NetworkPluginMTU),
} }