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.

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

🐛 Only bind the agent role for the addon group #721

Merged

Conversation

zhujian7
Copy link
Member

Summary

Related issue(s)

Fixes #

Copy link

codecov bot commented Nov 25, 2024

Codecov Report

Attention: Patch coverage is 79.54545% with 9 lines in your changes missing coverage. Please review.

Project coverage is 63.32%. Comparing base (41a01b1) to head (1a4ceb8).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
pkg/addon/controllers/addontemplate/controller.go 52.63% 9 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main     #721   +/-   ##
=======================================
  Coverage   63.32%   63.32%           
=======================================
  Files         186      186           
  Lines       17900    17912   +12     
=======================================
+ Hits        11335    11343    +8     
- Misses       5629     5634    +5     
+ Partials      936      935    -1     
Flag Coverage Δ
unit 63.32% <79.54%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zhujian7
Copy link
Member Author

/hold

Signed-off-by: zhujian <jiazhu@redhat.com>
Signed-off-by: zhujian <jiazhu@redhat.com>
Signed-off-by: zhujian <jiazhu@redhat.com>
@zhujian7
Copy link
Member Author

zhujian7 commented Dec 2, 2024

/unhold

@zhujian7
Copy link
Member Author

zhujian7 commented Dec 2, 2024

/cc @qiujian16

@openshift-ci openshift-ci bot requested a review from qiujian16 December 2, 2024 07:08
// trigger the manager to reconcile for the existing managed cluster addons
mcas, err := c.addonInformers.Addon().V1alpha1().ManagedClusterAddOns().Lister().List(labels.Everything())
if err != nil {
return err
Copy link
Member

Choose a reason for hiding this comment

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

i am not sure whether return err makes sense here. Should we stop the addon if there is error here? you will not have a chance to call list again if returning err.

Copy link
Member Author

Choose a reason for hiding this comment

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

@qiujian16 PTAL

Signed-off-by: zhujian <jiazhu@redhat.com>
Copy link
Member

@qiujian16 qiujian16 left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented Dec 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: qiujian16, zhujian7

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:

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

@openshift-ci openshift-ci bot added the approved label Dec 3, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 8093590 into open-cluster-management-io:main Dec 3, 2024
15 checks passed
@zhujian7
Copy link
Member Author

zhujian7 commented Dec 3, 2024

/cherrypick release-0.15

@openshift-cherrypick-robot

@zhujian7: #721 failed to apply on top of branch "release-0.15":

Applying: Only bind the agent role for the addon group
Applying: Update addon rolebinding
Applying: Tigger registration reconcile after start
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/addon/controllers/addontemplate/controller.go
M	pkg/addon/manager.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging pkg/addon/manager.go
Auto-merging pkg/addon/controllers/addontemplate/controller.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0003 Tigger registration reconcile after start

In response to this:

/cherrypick release-0.15

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants