[drain-helper] remove usage of deprecated methods #59
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 12016700549Details
💛 - Coveralls |
tariq1890
force-pushed
the
rm-deprec-method
branch
from
0110535 to
215f563
Compare
shivamerla
reviewed
Nov 25, 2024
pkg/upgrade/drain_manager.go
Outdated
| @@ -83,7 +83,7 @@ func (m *DrainManagerImpl) ScheduleNodesDrain(ctx context.Context, drainConfig * | |||
| GracePeriodSeconds: -1, | |||
| Timeout: time.Duration(drainSpec.TimeoutSecond) * time.Second, | |||
| PodSelector: drainSpec.PodSelector, | |||
| OnPodDeletedOrEvicted: func(pod *corev1.Pod, usingEviction bool) { | |||
| OnPodDeletionOrEvictionFinished: func(pod *corev1.Pod, usingEviction bool, _ error) { | |||
There was a problem hiding this comment.
Looks like the idea is to evaluate error field to determine if the eviction finished or failed. We should change the below logic accordingly. See e.g. here.
There was a problem hiding this comment.
Agreed. Thanks for pointing this out!
There was a problem hiding this comment.
Please check now
tariq1890
force-pushed
the
rm-deprec-method
branch
2 times, most recently
from
d55acf6 to
be3b5d3
Compare
tobiasgiese
reviewed
Nov 26, 2024
pkg/upgrade/drain_manager.go
Outdated
Comment on lines
87
to
104
| var verbStr string | ||
| if usingEviction { | ||
| verbStr = "Evicted" | ||
| if err != nil { | ||
| verbStr = "eviction failed" | ||
| } else { | ||
| verbStr = "evicted" | ||
| } | ||
| } else { | ||
| if err != nil { | ||
| verbStr = "deletion failed" | ||
| } else { | ||
| verbStr = "deleted" | ||
| } | ||
| } | ||
| if err != nil { | ||
| m.log.V(consts.LogLevelWarning).Info("pod deletion/eviction failed", "error", err) | ||
| } | ||
| m.log.V(consts.LogLevelInfo).Info(fmt.Sprintf("%s pod from Node %s/%s", verbStr, pod.Namespace, pod.Name)) | ||
| m.log.V(consts.LogLevelInfo).Info(fmt.Sprintf("pod %s/%s %s\n", pod.Namespace, pod.Name, verbStr)) |
There was a problem hiding this comment.
As the error handling is only to log to the correct level an alternative solution would be
log := m.log.WithValues("using-eviction", usingEviction, "pod", pod.Name, "namespace", pod.Namespace)
if err != nil {
log.V(consts.LogLevelWarning).Info("Drain Pod failed", "error", err)
return
}
log.V(consts.LogLevelInfo).Info("Drain Pod finished")We also don't need the new line (i.e., \n) in the log message, the go-logr will add this line.
There was a problem hiding this comment.
Done, thanks for the review @tobiasgiese ! Please check now
There was a problem hiding this comment.
Looks good to me now. Unfortunately I am not able to approve
tariq1890
force-pushed
the
rm-deprec-method
branch
from
be3b5d3 to
cb77bca
Compare
Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
tariq1890
force-pushed
the
rm-deprec-method
branch
from
cb77bca to
aa7dd9a
Compare
tobiasgiese
approved these changes
Dec 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.