fix: use index number in clusterStagedUpdateRun and add ApprovalAccepted status to ApprovalRequests #1019
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
jwtty
changed the title
jwtty
force-pushed
the
stagerun-index-fix
branch
3 times, most recently
from
2843cee to
79a44b9
Compare
jwtty
changed the title
jwtty
force-pushed
the
stagerun-index-fix
branch
5 times, most recently
from
c9bf1a9 to
dd0aad0
Compare
jwtty
force-pushed
the
stagerun-index-fix
branch
from
dd0aad0 to
fe9aefe
Compare
| GenericFunc: func(ctx context.Context, e event.GenericEvent, q workqueue.RateLimitingInterface) { | ||
| klog.V(2).InfoS("Handling a clusterApprovalRequest generic event", "clusterApprovalRequest", klog.KObj(e.Object)) | ||
| handleClusterApprovalRequest(e.Object, q) | ||
| handleClusterApprovalRequest(e.ObjectOld, e.ObjectNew, q) |
There was a problem hiding this comment.
just curious, I wonder why removing the genricFunc? I put it there just for safety as I am not 100% sure what is considered "generic".
| // and enqueues it to the ClusterStagedUpdateRun controller queue. | ||
| func handleClusterApprovalRequest(obj client.Object, q workqueue.RateLimitingInterface) { | ||
| approvalRequest, ok := obj.(*placementv1beta1.ClusterApprovalRequest) | ||
| // and enqueues it to the ClusterStagedUpdateRun controller queue only when the approved condition gets changed. |
There was a problem hiding this comment.
Suggested change
| // and enqueues it to the ClusterStagedUpdateRun controller queue only when the approved condition gets changed. | |
| // and enqueues it to the ClusterStagedUpdateRun controller queue only when the approved condition is changed. |
| klog.ErrorS(mismatchErr, "there's a new latest policy snapshot", "clusterResourcePlacement", placementName, "clusterStagedUpdateRun", updateRunRef) | ||
| return -1, nil, nil, fmt.Errorf("%w: %s", errStagedUpdatedAborted, mismatchErr.Error()) | ||
| } | ||
| // Make sure the cluster count in the policy snapshot has not changed. | ||
| if updateRun.Status.PolicyObservedClusterCount != clusterCount { | ||
| // PickAll policy case will be verified in validateStagesStatus. | ||
| if clusterCount != -1 && updateRun.Status.PolicyObservedClusterCount != clusterCount { |
There was a problem hiding this comment.
why adding the extra check since both will be -1 in the case of pickAll
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.
Description of your changes
ApprovalAcceptedstatus in approvalRequestsFixes #
I have:
make reviewableto ensure this PR is ready for review.How has this code been tested
Special notes for your reviewer