Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure local cluster is always in the managedcluster list #1637

Merged
merged 4 commits into from
Sep 30, 2024
Merged

Make sure local cluster is always in the managedcluster list #1637

merged 4 commits into from
Sep 30, 2024
+72 −52

Conversation

coleenquadros
Copy link
Contributor

@coleenquadros coleenquadros commented Sep 24, 2024 •
edited
Loading

  • Make sure local-cluster is always a part of internal managedcluster list and not depend on the CRUD events of the Managedcluster resource because when disableHubSelfManagement: true, the resource for local-cluster will not be created.
  • Use sync.Map for thread safe read and writes
  • fix unit tests to run predicate tests against managedcluster resource and not deployment

@coleenquadros coleenquadros changed the title make sure local cluster is part of list all the time Make sure local cluster is always in the managecluster list Sep 24, 2024
@coleenquadros coleenquadros changed the title Make sure local cluster is always in the managecluster list Make sure local cluster is always in the managedcluster list Sep 24, 2024
subbarao-meduri
subbarao-meduri approved these changes Sep 25, 2024
View reviewed changes
Copy link
Collaborator

@subbarao-meduri subbarao-meduri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 25, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coleenquadros, subbarao-meduri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [coleenquadros,subbarao-meduri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@coleenquadros
Copy link
Contributor Author

/retest

@coleenquadros
make sure local cluster is part of list all the time
5282eee 
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros
fix tests
aff406c 
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros
use sync map
b785a60 
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros
lint
328727f 
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@openshift-ci openshift-ci bot removed the lgtm label Sep 25, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Sep 25, 2024

New changes are detected. LGTM label has been removed.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Sep 25, 2024

Quality Gate Passed Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
96.6% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@coleenquadros
Copy link
Contributor Author

/retest

5 similar comments
@coleenquadros
Copy link
Contributor Author

/retest

@coleenquadros
Copy link
Contributor Author

/retest

@saswatamcode
Copy link
Member

/retest

@saswatamcode
Copy link
Member

/retest

@coleenquadros
Copy link
Contributor Author

/retest

@coleenquadros
Copy link
Contributor Author

/test test-e2e

1 similar comment
@coleenquadros
Copy link
Contributor Author

/test test-e2e

@coleenquadros coleenquadros merged commit 4ade8e0 into stolostron:main Sep 30, 2024
21 of 22 checks passed
@coleenquadros
Copy link
Contributor Author

/cherrypick release-2.11

@coleenquadros
Copy link
Contributor Author

/cherrypick release-2.10

@coleenquadros
Copy link
Contributor Author

/cherrypick release-2.11

@openshift-cherrypick-robot
Copy link
Collaborator

@coleenquadros: new pull request created: #1640

In response to this:

/cherrypick release-2.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 30, 2024
Closed
@coleenquadros
Copy link
Contributor Author

/cherrypick release-2.10

@openshift-cherrypick-robot
Copy link
Collaborator

@coleenquadros: #1637 failed to apply on top of branch "release-2.10":

Applying: make sure local cluster is part of list all the time
Using index info to reconstruct a base tree...
M	operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
M	operators/multiclusterobservability/controllers/placementrule/predicate_func.go
Falling back to patching base and 3-way merge...
Auto-merging operators/multiclusterobservability/controllers/placementrule/predicate_func.go
Auto-merging operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
CONFLICT (content): Merge conflict in operators/multiclusterobservability/controllers/placementrule/placementrule_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 make sure local cluster is part of list all the time
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

coleenquadros added a commit that referenced this pull request Sep 30, 2024
@coleenquadros
Make sure local cluster is always in the managedcluster list (#1637)
03ec80f 
* make sure local cluster is part of list all the time

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* fix tests

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* use sync map

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

* lint

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>

---------

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@subbarao-meduri subbarao-meduri subbarao-meduri approved these changes

Assignees

@subbarao-meduri subbarao-meduri

Labels
approved dco-signoff: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@coleenquadros @saswatamcode @openshift-cherrypick-robot @subbarao-meduri