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
503ac59a
Commit
503ac59a
authored
May 13, 2019
by
yameiwang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typo in kuberuntime_manager.go
parent
8fecbd8e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
kuberuntime_container.go
pkg/kubelet/kuberuntime/kuberuntime_container.go
+1
-1
kuberuntime_manager.go
pkg/kubelet/kuberuntime/kuberuntime_manager.go
+1
-1
No files found.
pkg/kubelet/kuberuntime/kuberuntime_container.go
View file @
503ac59a
...
@@ -546,7 +546,7 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec
...
@@ -546,7 +546,7 @@ func (m *kubeGenericRuntimeManager) killContainer(pod *v1.Pod, containerID kubec
pod
,
containerSpec
=
restoredPod
,
restoredContainer
pod
,
containerSpec
=
restoredPod
,
restoredContainer
}
}
// From this point
, pod and container must be non-nil.
// From this point, pod and container must be non-nil.
gracePeriod
:=
int64
(
minimumGracePeriodInSeconds
)
gracePeriod
:=
int64
(
minimumGracePeriodInSeconds
)
switch
{
switch
{
case
pod
.
DeletionGracePeriodSeconds
!=
nil
:
case
pod
.
DeletionGracePeriodSeconds
!=
nil
:
...
...
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View file @
503ac59a
...
@@ -377,7 +377,7 @@ type containerToKillInfo struct {
...
@@ -377,7 +377,7 @@ type containerToKillInfo struct {
type
podActions
struct
{
type
podActions
struct
{
// Stop all running (regular and init) containers and the sandbox for the pod.
// Stop all running (regular and init) containers and the sandbox for the pod.
KillPod
bool
KillPod
bool
// Whether need to create a new sandbox. If needed to kill pod and create
a
// Whether need to create a new sandbox. If needed to kill pod and create
// a new pod sandbox, all init containers need to be purged (i.e., removed).
// a new pod sandbox, all init containers need to be purged (i.e., removed).
CreateSandbox
bool
CreateSandbox
bool
// The id of existing sandbox. It is used for starting containers in ContainersToStart.
// The id of existing sandbox. It is used for starting containers in ContainersToStart.
...
...
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