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

Merge pull request #54460 from yanxuean/cnibindir

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 54460, 55258, 54858, 55506, 55510). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

redendancy code and error log message in cni

**What this PR does / why we need it**:
redendancy code and error log message in cni
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
```release-note
NONE
```

/sig-node
This commit is contained in:
Kubernetes Submit Queue 2017-11-11 10:45:16 -08:00 committed by GitHub
commit f14c0382e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -903,14 +903,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

@ -577,13 +577,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),
} }

2
pkg/kubelet/network/cni/cni.go
View File

@ -282,7 +282,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) { 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("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{ rt := &libcni.RuntimeConf{
ContainerID: podSandboxID.ID, ContainerID: podSandboxID.ID,