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
e25ff463
Commit
e25ff463
authored
May 11, 2019
by
daihao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix daemon set rolling update hang
parent
6897c68d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
daemon_controller.go
pkg/controller/daemon/daemon_controller.go
+9
-0
No files found.
pkg/controller/daemon/daemon_controller.go
View file @
e25ff463
...
@@ -535,6 +535,15 @@ func (dsc *DaemonSetsController) updatePod(old, cur interface{}) {
...
@@ -535,6 +535,15 @@ func (dsc *DaemonSetsController) updatePod(old, cur interface{}) {
return
return
}
}
if
curPod
.
DeletionTimestamp
!=
nil
{
// when a pod is deleted gracefully its deletion timestamp is first modified to reflect a grace period,
// and after such time has passed, the kubelet actually deletes it from the store. We receive an update
// for modification of the deletion timestamp and expect an ds to create more replicas asap, not wait
// until the kubelet actually deletes the pod.
dsc
.
deletePod
(
curPod
)
return
}
curControllerRef
:=
metav1
.
GetControllerOf
(
curPod
)
curControllerRef
:=
metav1
.
GetControllerOf
(
curPod
)
oldControllerRef
:=
metav1
.
GetControllerOf
(
oldPod
)
oldControllerRef
:=
metav1
.
GetControllerOf
(
oldPod
)
controllerRefChanged
:=
!
reflect
.
DeepEqual
(
curControllerRef
,
oldControllerRef
)
controllerRefChanged
:=
!
reflect
.
DeepEqual
(
curControllerRef
,
oldControllerRef
)
...
...
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