🌱 clustercache: do not use RequeueAfter when hitting ErrClusterNotConnected #11736
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
k8s-ci-robot
added
area/clustercache
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold To do some scale test on-top |
k8s-ci-robot
added
the
size/M
k8s-ci-robot
added
the
do-not-merge/hold
|
/hold cancel Scale tests look good (500 clusters). No increased provisioning times. |
k8s-ci-robot
added
size/L
…cted and return error instead
chrischdi
force-pushed
the
pr-clustercache-no-requeueafter-on-ErrClusterNotConnected
branch
from
33d78e1 to
5d109d8
Compare
|
/test pull-cluster-api-e2e-main |
sbueringer
reviewed
Jan 24, 2025
Comment on lines
+806
to
+808
| log.V(5).Info("Waiting for Cluster connection to come up to drain the Node") | ||
| s.deletingReason = clusterv1.MachineDeletingDrainingNodeV1Beta2Reason | ||
| s.deletingMessage = "Waiting for Cluster connection to come up to drain the Node" |
There was a problem hiding this comment.
Suggested change
| log.V(5).Info("Waiting for Cluster connection to come up to drain the Node") | |
| s.deletingReason = clusterv1.MachineDeletingDrainingNodeV1Beta2Reason | |
| s.deletingMessage = "Waiting for Cluster connection to come up to drain the Node" |
- error shows up anyway because we propagate it up
- deletingReason / deletingMessage are overwritten one level higher
| log.V(5).Info("Waiting for Cluster connection to come up to drain the Node") | ||
| s.deletingReason = clusterv1.MachineDeletingDrainingNodeV1Beta2Reason | ||
| s.deletingMessage = "Waiting for Cluster connection to come up to drain the Node" | ||
| return ctrl.Result{}, err |
There was a problem hiding this comment.
Suggested change
| return ctrl.Result{}, err | |
| return ctrl.Result{}, errors.Wrapf(err, "failed to drain Node %s", nodeName) |
9 tasks
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.
What this PR does / why we need it:
Follow-up to: #11272
Clustercache emits events once the connection is back, so no need to use
RequeueAfter.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
/area clustercache