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
4921a62f
Commit
4921a62f
authored
Oct 07, 2015
by
Michael Puncel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comment typo and remove unnecessary line
parent
60b1abda
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
manager.go
pkg/kubelet/dockertools/manager.go
+2
-3
No files found.
pkg/kubelet/dockertools/manager.go
View file @
4921a62f
...
...
@@ -1646,7 +1646,6 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
containersToStart
:=
make
(
map
[
int
]
empty
)
containersToKeep
:=
make
(
map
[
kubeletTypes
.
DockerID
]
int
)
createPodInfraContainer
:=
false
var
err
error
var
podInfraContainerID
kubeletTypes
.
DockerID
...
...
@@ -1660,7 +1659,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
}
}
createPodInfraContainer
=
true
createPodInfraContainer
:
=
true
if
podInfraContainer
==
nil
{
glog
.
V
(
2
)
.
Infof
(
"Need to restart pod infra container for %q because it is not found"
,
podFullName
)
}
else
if
changed
{
...
...
@@ -1693,7 +1692,7 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, runningPod kub
if
createPodInfraContainer
{
// createPodInfraContainer == true and Container exists
// If we're creating infra container
e
everything will be killed anyway
// If we're creating infra container everything will be killed anyway
// If RestartPolicy is Always or OnFailure we restart containers that were running before we
// killed them when restarting Infra Container.
if
pod
.
Spec
.
RestartPolicy
!=
api
.
RestartPolicyNever
{
...
...
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