Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GT-467 [Bugfix] Fix Member Terminating state discovery #1389

Merged
merged 2 commits into from
Aug 29, 2023
Merged

GT-467 [Bugfix] Fix Member Terminating state discovery #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
876df0f
[Bugfix] Fix Member Terminating state discovery
ajanikow Aug 24, 2023
8a98179
Merge branch 'master' into bugfix/fix_pod_terminating_discovery
ajanikow Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- (Feature) Deprecate Actions
- (Bugfix) Debug mode
- (Improvement) Switch to Lease API
- (Bugfix) Fix Member Terminating state discovery

## [1.2.32](https://github.com/arangodb/kube-arangodb/tree/1.2.32) (2023-08-07)
- (Feature) Backup lifetime - remove Backup once its lifetime has been reached
Expand Down
5 changes: 2 additions & 3 deletions pkg/util/k8sutil/pods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,9 @@ func IsPodMarkedForDeletion(pod *core.Pod) bool {
return pod.DeletionTimestamp != nil
}

// IsPodTerminating returns true if the pod has been marked for deletion
// but is still running.
// IsPodTerminating returns true if the pod has been marked for deletion.
func IsPodTerminating(pod *core.Pod) bool {
return IsPodMarkedForDeletion(pod) && pod.Status.Phase == core.PodRunning
return IsPodMarkedForDeletion(pod)
}

// getPodCondition returns the condition of given type in the given status.
Expand Down