Skip to content

Commit

Permalink
Merge pull request #92 from capetrei/feature/lookup-initcontainer
Browse files Browse the repository at this point in the history
check also for initcontianers in ShouldReap
  • Loading branch information
brianberzins authored Mar 20, 2024
2 parents e9657d4 + 91f8007 commit 7bfe82f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# pod-reaper: kills pods dead

### 2.13.0
- the reaper checks now also the initContainerStatus

### 2.7.0
- add `DRY_RUN` mode

Expand Down
10 changes: 10 additions & 0 deletions rules/container_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,16 @@ func (rule *containerStatus) ShouldReap(pod v1.Pod) (bool, string) {
return true, fmt.Sprintf("has container status %s", reapStatus)
}
}

// Check init containers
for _, initContainerStatus := range pod.Status.InitContainerStatuses {
state := initContainerStatus.State
// Check both waiting and terminated conditions for init containers
if (state.Waiting != nil && state.Waiting.Reason == reapStatus) ||
(state.Terminated != nil && state.Terminated.Reason == reapStatus) {
return true, fmt.Sprintf("has init container status %s", reapStatus)
}
}
}
return false, ""
}

0 comments on commit 7bfe82f

Please sign in to comment.