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
e3e0bc6c
Commit
e3e0bc6c
authored
Mar 09, 2017
by
David Ashpole
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not skip pods that can be deleted
parent
24d84fa3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
status_manager.go
pkg/kubelet/status/status_manager.go
+2
-2
No files found.
pkg/kubelet/status/status_manager.go
View file @
e3e0bc6c
...
@@ -393,7 +393,7 @@ func (m *manager) syncBatch() {
...
@@ -393,7 +393,7 @@ func (m *manager) syncBatch() {
}
}
syncedUID
=
mirrorUID
syncedUID
=
mirrorUID
}
}
if
m
.
needsUpdate
(
syncedUID
,
status
)
||
m
.
couldBeDeleted
(
uid
,
status
.
status
)
{
if
m
.
needsUpdate
(
syncedUID
,
status
)
{
updatedStatuses
=
append
(
updatedStatuses
,
podStatusSyncRequest
{
uid
,
status
})
updatedStatuses
=
append
(
updatedStatuses
,
podStatusSyncRequest
{
uid
,
status
})
}
else
if
m
.
needsReconcile
(
uid
,
status
.
status
)
{
}
else
if
m
.
needsReconcile
(
uid
,
status
.
status
)
{
// Delete the apiStatusVersions here to force an update on the pod status
// Delete the apiStatusVersions here to force an update on the pod status
...
@@ -469,7 +469,7 @@ func (m *manager) syncPod(uid types.UID, status versionedPodStatus) {
...
@@ -469,7 +469,7 @@ func (m *manager) syncPod(uid types.UID, status versionedPodStatus) {
// This method is not thread safe, and most only be accessed by the sync thread.
// This method is not thread safe, and most only be accessed by the sync thread.
func
(
m
*
manager
)
needsUpdate
(
uid
types
.
UID
,
status
versionedPodStatus
)
bool
{
func
(
m
*
manager
)
needsUpdate
(
uid
types
.
UID
,
status
versionedPodStatus
)
bool
{
latest
,
ok
:=
m
.
apiStatusVersions
[
uid
]
latest
,
ok
:=
m
.
apiStatusVersions
[
uid
]
return
!
ok
||
latest
<
status
.
version
return
!
ok
||
latest
<
status
.
version
||
m
.
couldBeDeleted
(
uid
,
status
.
status
)
}
}
func
(
m
*
manager
)
couldBeDeleted
(
uid
types
.
UID
,
status
v1
.
PodStatus
)
bool
{
func
(
m
*
manager
)
couldBeDeleted
(
uid
types
.
UID
,
status
v1
.
PodStatus
)
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