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
8ba70b57
Commit
8ba70b57
authored
Mar 04, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #22483 from yujuhong/force_update
Auto commit by PR queue bot
parents
57c944ca
0264ebdd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
manager.go
pkg/kubelet/status/manager.go
+4
-1
No files found.
pkg/kubelet/status/manager.go
View file @
8ba70b57
...
@@ -148,7 +148,10 @@ func (m *manager) SetPodStatus(pod *api.Pod, status api.PodStatus) {
...
@@ -148,7 +148,10 @@ func (m *manager) SetPodStatus(pod *api.Pod, status api.PodStatus) {
if
err
!=
nil
{
if
err
!=
nil
{
return
return
}
}
m
.
updateStatusInternal
(
pod
,
status
,
false
)
// Force a status update if deletion timestamp is set. This is necessary
// because if the pod is in the non-running state, the pod worker still
// needs to be able to trigger an update and/or deletion.
m
.
updateStatusInternal
(
pod
,
status
,
pod
.
DeletionTimestamp
!=
nil
)
}
}
func
(
m
*
manager
)
SetContainerReadiness
(
podUID
types
.
UID
,
containerID
kubecontainer
.
ContainerID
,
ready
bool
)
{
func
(
m
*
manager
)
SetContainerReadiness
(
podUID
types
.
UID
,
containerID
kubecontainer
.
ContainerID
,
ready
bool
)
{
...
...
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