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
e5a84398
Commit
e5a84398
authored
Sep 16, 2016
by
Kubernetes Submit Queue
Committed by
GitHub
Sep 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #32836 from yujuhong/fix_nil_ptr
Automatic merge from submit-queue kuberuntime: fix nil pointer dereference in killPodWithSyncResult This fixes #32742
parents
2ca15b9f
18f230c5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
kuberuntime_manager.go
pkg/kubelet/kuberuntime/kuberuntime_manager.go
+3
-3
No files found.
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View file @
e5a84398
...
...
@@ -668,15 +668,15 @@ func (m *kubeGenericRuntimeManager) killPodWithSyncResult(pod *api.Pod, runningP
return
}
if
!
isHostNetwork
{
teardownNetworkResult
:=
kubecontainer
.
NewSyncResult
(
kubecontainer
.
TeardownNetwork
,
pod
.
U
ID
)
teardownNetworkResult
:=
kubecontainer
.
NewSyncResult
(
kubecontainer
.
TeardownNetwork
,
runningPod
.
ID
)
result
.
AddSyncResult
(
teardownNetworkResult
)
// Tear down network plugin with sandbox id
if
err
:=
m
.
networkPlugin
.
TearDownPod
(
runningPod
.
Namespace
,
runningPod
.
Name
,
kubecontainer
.
ContainerID
{
Type
:
m
.
runtimeName
,
ID
:
sandboxID
,
});
err
!=
nil
{
message
:=
fmt
.
Sprintf
(
"Failed to teardown network for pod %
q
using network plugins %q: %v"
,
format
.
Pod
(
pod
)
,
m
.
networkPlugin
.
Name
(),
err
)
message
:=
fmt
.
Sprintf
(
"Failed to teardown network for pod %
s_%s(%s)
using network plugins %q: %v"
,
runningPod
.
Name
,
runningPod
.
Namespace
,
runningPod
.
ID
,
m
.
networkPlugin
.
Name
(),
err
)
teardownNetworkResult
.
Fail
(
kubecontainer
.
ErrTeardownNetwork
,
message
)
glog
.
Error
(
message
)
}
...
...
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