Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
aa86d773
Commit
aa86d773
authored
May 06, 2017
by
zdj6373
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Log changes
parent
b9f340d9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
cni.go
pkg/kubelet/network/cni/cni.go
+2
-2
No files found.
pkg/kubelet/network/cni/cni.go
View file @
aa86d773
...
...
@@ -278,7 +278,7 @@ func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name strin
func
(
plugin
*
cniNetworkPlugin
)
addToNetwork
(
network
*
cniNetwork
,
podName
string
,
podNamespace
string
,
podInfraContainerID
kubecontainer
.
ContainerID
,
podNetnsPath
string
)
(
cnitypes
.
Result
,
error
)
{
rt
,
err
:=
plugin
.
buildCNIRuntimeConf
(
podName
,
podNamespace
,
podInfraContainerID
,
podNetnsPath
)
if
err
!=
nil
{
glog
.
Errorf
(
"Error adding network when bu
li
ding cni runtime conf: %v"
,
err
)
glog
.
Errorf
(
"Error adding network when bu
il
ding cni runtime conf: %v"
,
err
)
return
nil
,
err
}
...
...
@@ -296,7 +296,7 @@ func (plugin *cniNetworkPlugin) addToNetwork(network *cniNetwork, podName string
func
(
plugin
*
cniNetworkPlugin
)
deleteFromNetwork
(
network
*
cniNetwork
,
podName
string
,
podNamespace
string
,
podInfraContainerID
kubecontainer
.
ContainerID
,
podNetnsPath
string
)
error
{
rt
,
err
:=
plugin
.
buildCNIRuntimeConf
(
podName
,
podNamespace
,
podInfraContainerID
,
podNetnsPath
)
if
err
!=
nil
{
glog
.
Errorf
(
"Error deleting network when bu
li
ding cni runtime conf: %v"
,
err
)
glog
.
Errorf
(
"Error deleting network when bu
il
ding cni runtime conf: %v"
,
err
)
return
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment