External changes on several failed updates for all clusters #689
+216
−601
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
ribaraka
added
enhancement
worryg0d
reviewed
Jan 26, 2024
controllers/clusters/helpers.go
Outdated
| resource.GetAnnotations()[models.ExternalChangesAnnotation] = "" | ||
| resource.GetAnnotations()[models.ResourceStateAnnotation] = models.UpdatedEvent | ||
|
|
||
| fmt.Println("resource.GetAnnotations()[models.ResourceStateAnnotation] ", resource.GetAnnotations()[models.ResourceStateAnnotation]) |
controllers/clusters/helpers.go
Outdated
|
|
||
| fmt.Println("resource.GetAnnotations()[models.ResourceStateAnnotation] ", resource.GetAnnotations()[models.ResourceStateAnnotation]) | ||
|
|
||
| l.Info("External changes have been reconciled", "resource ID", resource.GetClusterID()) |
There was a problem hiding this comment.
I think resource ID -> cluster ID is more suitable
ribaraka
force-pushed
the
rimiter
branch
3 times, most recently
from
ef54408 to
dacb39d
Compare
worryg0d
approved these changes
Jan 26, 2024
testisnullus
requested changes
Jan 26, 2024
| @@ -247,6 +246,12 @@ func (r *ZookeeperReconciler) handleUpdateCluster( | |||
| return reconcile.Result{}, err | |||
| } | |||
|
|
|||
| if zook.Annotations[models.ExternalChangesAnnotation] == models.True || | |||
| r.RateLimiter.NumRequeues(req) == rlimiter.DefaultMaxTries || | |||
| !zook.Spec.IsEqual(iZook.Spec) { | |||
There was a problem hiding this comment.
Let's remove !zook.Spec.IsEqual(iZook.Spec) check, cause we checked this case inside the handleExternalChanges func
testisnullus
approved these changes
Jan 26, 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.
Refactor the codebase by eliminating the
UpdateQueuedAnnotationannotation and unnecessary redundancy in handling external changes. This PR enhances code clarity and readability, resulting in a cleaner implementation. Now the operator handles InstAPI Update errors - after several errors, the operator returns external changes and blocks the update operation