github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Investigate and fix the handling of Succeeded pods in DaemonSet

Browse Source
This commit is contained in:
Michal Wozniak
2023-04-03 19:58:55 +02:00
parent d89d5ab268
commit b5dd5f1f3a
2 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/daemon/daemon_controller.go
View File

@@ -75,6 +75,8 @@ const (
FailedPlacementReason = "FailedPlacement"
// FailedDaemonPodReason is added to an event when the status of a Pod of a DaemonSet is 'Failed'.
FailedDaemonPodReason = "FailedDaemonPod"
// SucceededDaemonPodReason is added to an event when the status of a Pod of a DaemonSet is 'Succeeded'.
SucceededDaemonPodReason = "SucceededDaemonPod"
)
// controllerKind contains the schema.GroupVersionKind for this controller type.
@@ -842,6 +844,12 @@ func (dsc *DaemonSetsController) podsShouldBeOnNode(
// Emit an event so that it's discoverable to users.
dsc.eventRecorder.Eventf(ds, v1.EventTypeWarning, FailedDaemonPodReason, msg)
podsToDelete = append(podsToDelete, pod.Name)
} else if pod.Status.Phase == v1.PodSucceeded {
msg := fmt.Sprintf("Found succeeded daemon pod %s/%s on node %s, will try to delete it", pod.Namespace, pod.Name, node.Name)
logger.V(2).Info("Found succeeded daemon pod on node, will try to delete it", "pod", klog.KObj(pod), "node", klog.KObj(node))
// Emit an event so that it's discoverable to users.
dsc.eventRecorder.Eventf(ds, v1.EventTypeNormal, SucceededDaemonPodReason, msg)
podsToDelete = append(podsToDelete, pod.Name)
} else {
daemonPodsRunning = append(daemonPodsRunning, pod)
}