Extraction of creation and deletion logic of Cassandra User from controller predicates #616
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
worryg0d
force-pushed
the
issue-607-moving-user-crud-out-of-predicates
branch
5 times, most recently
from
97a6741 to
60a82b9
Compare
worryg0d
changed the title
worryg0d
changed the title
worryg0d
requested review from
ribaraka,
testisnullus,
DoodgeMatvey,
tengu-alt and
OleksiienkoMykyta
testisnullus
approved these changes
Nov 9, 2023
ribaraka
requested changes
Nov 10, 2023
Comment on lines
388
to
395
| addedRefs, deletedRefs := cassandra.Status.AvailableUsers.Diff(cassandra.Spec.UserRefs) | ||
|
|
||
| for _, ref := range addedRefs { | ||
| err = r.handleUsersCreate(ctx, l, cassandra, ref) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
|
|
||
| for _, ref := range deletedRefs { | ||
| err = r.handleUsersDelete(ctx, l, cassandra, ref) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
|
|
||
| if addedRefs != nil || deletedRefs != nil { | ||
| cassandra.Status.AvailableUsers = cassandra.Spec.UserRefs | ||
| err = r.Status().Patch(ctx, cassandra, patch) | ||
| if err != nil { | ||
| l.Error(err, "Failed to patch cluster status with created user") | ||
| r.EventRecorder.Eventf(cassandra, models.Warning, models.CreationFailed, | ||
| "Failed to create a user for the cluster. Reason: %v", err) | ||
|
|
||
| return reconcile.Result{}, err | ||
| } | ||
| } |
There was a problem hiding this comment.
if possible please make it generic and call it handleUserChanges
There was a problem hiding this comment.
I've implemented the following flow as a generic by using interfaces. Also, I've implemented a generic func for detaching users from the cluster.
worryg0d
force-pushed
the
issue-607-moving-user-crud-out-of-predicates
branch
from
e15e84b to
8191a3a
Compare
ribaraka
approved these changes
Nov 14, 2023
…cassandra controller predicates
worryg0d
force-pushed
the
issue-607-moving-user-crud-out-of-predicates
branch
from
8191a3a to
5de755e
Compare
testisnullus
approved these changes
Nov 14, 2023
This was referenced Nov 15, 2023
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.
Our previous implementation of the creation and deletion of users for the
Cassandraresource manages to do it in predicates. Implementing the CRUD inside theReconcilefunc is natural and convenient.It also allows controllers to re-run reconciliation if there is any error during the creation or deletion of the user, which it is not reachable when it uses predicates.
The PR extracts
CassandraUserCRUD functions out ofCassandraControllerpredicates.(upd. 13.11) Added a generic solution for handling user changes for all user resources.
(upd. 14.11) Enhanced approach to handling user changes; added generic detaching users func