storageClusterPeer: add logic for storageclusterpeer controller #2678
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
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: rewantsoni 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 |
|
/retest-required |
rchikatw
reviewed
Jul 8, 2024
leelavg
reviewed
Jul 16, 2024
controllers/util/k8sutil.go
Outdated
| @@ -42,6 +42,9 @@ const ( | |||
|
|
|||
| // This is the name for the OwnerUID FieldIndex | |||
| OwnerUIDIndexName = "ownerUID" | |||
|
|
|||
| // CephBlockPoolBlackListAnnotation is used to disable cephBlockPool mirroring for RDR | |||
| CephBlockPoolBlackListAnnotation = "ocs.openshift.io/disable-mirroring" | |||
There was a problem hiding this comment.
Possible to use allow/reject synonyms?
There was a problem hiding this comment.
Updated it to use CephBlockPoolForbidMirroringLabel = "ocs.openshift.io/forbid-mirroring"
Comment on lines
80
to
84
| CreateFunc: func(createEvent event.CreateEvent) bool { | ||
| // Check if the annotation is not present | ||
| if createEvent.Object.GetAnnotations() == nil { | ||
| return false | ||
| } | ||
| if _, exists := createEvent.Object.GetAnnotations()[util.CephBlockPoolBlackListAnnotation]; !exists { | ||
| return false | ||
| } | ||
| return true | ||
| }, |
There was a problem hiding this comment.
why not use a value for annotation and change predicates to
CreateFunc: func(e event.CreateEvent) bool {
return e.Object.GetAnnotations()[annotation] != ""
}| func (r *StorageClusterPeerReconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) { | ||
| var err error | ||
| r.ctx = ctrllog.IntoContext(ctx, r.Log) | ||
| r.Log.Info("Reconciling StorageClusterPeer.") |
There was a problem hiding this comment.
in the logs, could you pls check in this line, how many times the context is being logged? I wasn't able to find the offending line and probably think supplied param ctx already has object and again ctrllog.IntoContext duplicates it.
controllers/storageclusterpeer/storageclusterpeer_controller.go
Outdated
Show resolved
Hide resolved
openshift-merge-robot
added
the
needs-rebase
rewantsoni
force-pushed
the
scp-controller
branch
from
1ea99b9
to
274a469
Compare
openshift-merge-robot
removed
the
needs-rebase
rewantsoni
force-pushed
the
scp-controller
branch
6 times, most recently
from
c31ebbe
to
cd4371e
Compare
leelavg
reviewed
Aug 9, 2024
controllers/storageclusterpeer/storageclusterpeer_controller.go
Outdated
Show resolved
Hide resolved
controllers/storageclusterpeer/storageclusterpeer_controller.go
Outdated
Show resolved
Hide resolved
controllers/storageclusterpeer/storageclusterpeer_controller.go
Outdated
Show resolved
Hide resolved
controllers/storageclusterpeer/storageclusterpeer_controller.go
Outdated
Show resolved
Hide resolved
openshift-merge-robot
added
the
needs-rebase
Signed-off-by: Rewant Soni <resoni@redhat.com>
ran make gen-protobuf to generate the code Signed-off-by: Rewant Soni <resoni@redhat.com>
Signed-off-by: Rewant Soni <resoni@redhat.com>
Signed-off-by: Rewant Soni <resoni@redhat.com>
Signed-off-by: Rewant Soni <resoni@redhat.com>
Signed-off-by: Rewant Soni <resoni@redhat.com>
rewantsoni
force-pushed
the
scp-controller
branch
from
cd4371e
to
47ad908
Compare
openshift-merge-robot
removed
the
needs-rebase
Signed-off-by: Rewant Soni <resoni@redhat.com>
rewantsoni
force-pushed
the
scp-controller
branch
from
47ad908
to
4b3c038
Compare
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.
add logic for storage cluster peer controller
Depends on:
Part of RHSTOR-4886
(review only the last two commits)