-
Notifications
You must be signed in to change notification settings - Fork 133
Bump dependencies and fix deprecated API usage #1032
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.
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
Merged
zeeke
merged 1 commit into
k8snetworkplumbingwg:master
from
SchSeba:bump-dependencies-pr1027
Feb 17, 2026
+103
−124
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -26,19 +26,21 @@ func (dr *DrainReconcile) handleNodeIdleNodeStateDrainingOrCompleted(ctx context | |||||||||||||||||||||
| completed, err := dr.drainer.CompleteDrainNode(ctx, node) | ||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||
| reqLogger.Error(err, "failed to complete drain on node") | ||||||||||||||||||||||
| dr.recorder.Event(nodeNetworkState, | ||||||||||||||||||||||
| dr.recorder.Eventf(nodeNetworkState, nil, | ||||||||||||||||||||||
| corev1.EventTypeWarning, | ||||||||||||||||||||||
| "DrainController", | ||||||||||||||||||||||
| "CompleteDrain", | ||||||||||||||||||||||
| "failed to drain node") | ||||||||||||||||||||||
| return ctrl.Result{}, err | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| // if we didn't manage to complete the un drain of the node we retry | ||||||||||||||||||||||
| if !completed { | ||||||||||||||||||||||
| reqLogger.Info("complete drain was not completed re queueing the request") | ||||||||||||||||||||||
| dr.recorder.Event(nodeNetworkState, | ||||||||||||||||||||||
| dr.recorder.Eventf(nodeNetworkState, nil, | ||||||||||||||||||||||
| corev1.EventTypeWarning, | ||||||||||||||||||||||
| "DrainController", | ||||||||||||||||||||||
| "CompleteDrain", | ||||||||||||||||||||||
| "node complete drain was not completed") | ||||||||||||||||||||||
| // TODO: make this time configurable | ||||||||||||||||||||||
| return reconcile.Result{RequeueAfter: constants.DrainControllerRequeueTime}, nil | ||||||||||||||||||||||
|
|
@@ -52,9 +54,10 @@ func (dr *DrainReconcile) handleNodeIdleNodeStateDrainingOrCompleted(ctx context | |||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| reqLogger.Info("completed the un drain for node") | ||||||||||||||||||||||
| dr.recorder.Event(nodeNetworkState, | ||||||||||||||||||||||
| dr.recorder.Eventf(nodeNetworkState, nil, | ||||||||||||||||||||||
| corev1.EventTypeWarning, | ||||||||||||||||||||||
| "DrainController", | ||||||||||||||||||||||
| "CompleteDrain", | ||||||||||||||||||||||
| "node un drain completed") | ||||||||||||||||||||||
| return ctrl.Result{}, nil | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
@@ -105,19 +108,21 @@ func (dr *DrainReconcile) handleNodeDrainOrReboot(ctx context.Context, | |||||||||||||||||||||
| drained, err := dr.drainer.DrainNode(ctx, node, fullNodeDrain, singleNode) | ||||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||||
| reqLogger.Error(err, "error trying to drain the node") | ||||||||||||||||||||||
| dr.recorder.Event(nodeNetworkState, | ||||||||||||||||||||||
| dr.recorder.Eventf(nodeNetworkState, nil, | ||||||||||||||||||||||
| corev1.EventTypeWarning, | ||||||||||||||||||||||
| "DrainController", | ||||||||||||||||||||||
| "DrainNode", | ||||||||||||||||||||||
| "failed to drain node") | ||||||||||||||||||||||
| return reconcile.Result{}, err | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| // if we didn't manage to complete the drain of the node we retry | ||||||||||||||||||||||
| if !drained { | ||||||||||||||||||||||
| reqLogger.Info("the nodes was not drained re queueing the request") | ||||||||||||||||||||||
| dr.recorder.Event(nodeNetworkState, | ||||||||||||||||||||||
| dr.recorder.Eventf(nodeNetworkState, nil, | ||||||||||||||||||||||
| corev1.EventTypeWarning, | ||||||||||||||||||||||
| "DrainController", | ||||||||||||||||||||||
| "DrainNode", | ||||||||||||||||||||||
| "node drain operation was not completed") | ||||||||||||||||||||||
| return reconcile.Result{RequeueAfter: constants.DrainControllerRequeueTime}, nil | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
@@ -130,9 +135,10 @@ func (dr *DrainReconcile) handleNodeDrainOrReboot(ctx context.Context, | |||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| reqLogger.Info("node drained successfully") | ||||||||||||||||||||||
| dr.recorder.Event(nodeNetworkState, | ||||||||||||||||||||||
| dr.recorder.Eventf(nodeNetworkState, nil, | ||||||||||||||||||||||
| corev1.EventTypeWarning, | ||||||||||||||||||||||
| "DrainController", | ||||||||||||||||||||||
| "DrainNode", | ||||||||||||||||||||||
| "node drain completed") | ||||||||||||||||||||||
|
Comment on lines
+138
to
142
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To maintain clear and actionable event logs, successful operations should generate
Suggested change
|
||||||||||||||||||||||
| return ctrl.Result{}, nil | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
corev1.EventTypeNormalfor successful operations like this one improves observability. It helps operators distinguish between normal operational events and actual warnings that might require attention.