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

🐛 Fix: add a condition of manifestapplied for hosted addon. #267

Conversation

xuezhaojun
Copy link
Member

Summary

For hosted mode addons, there are no manifestwork need to be applied by default addondeploycontroller, we want to add a condition to state that.

Signed-off-by: xuezhaojun <zxue@redhat.com>
@openshift-ci openshift-ci bot requested review from deads2k and elgnay May 14, 2024 16:42
@xuezhaojun
Copy link
Member Author

TODO: The fix need to be cherry-pick to release 0.9.3.

@xuezhaojun
Copy link
Member Author

/assign @qiujian16

@qiujian16
Copy link
Member

/cherry-pick release-0.9

@openshift-cherrypick-robot
Copy link
Contributor

@qiujian16: once the present PR merges, I will cherry-pick it on top of release-0.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.9

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.

@xuezhaojun xuezhaojun closed this May 15, 2024
@xuezhaojun xuezhaojun reopened this May 15, 2024
@qiujian16
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm label May 16, 2024
Copy link
Contributor

openshift-ci bot commented May 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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-merge-bot openshift-merge-bot bot merged commit 286f8d0 into open-cluster-management-io:main May 16, 2024
20 of 23 checks passed
@openshift-cherrypick-robot
Copy link
Contributor

@qiujian16: #267 failed to apply on top of branch "release-0.9":

Applying: Fix: add a condition of manifestapplied for hosted addon.
Using index info to reconstruct a base tree...
M	pkg/addonmanager/controllers/agentdeploy/controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/addonmanager/controllers/agentdeploy/controller.go
CONFLICT (content): Merge conflict in pkg/addonmanager/controllers/agentdeploy/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 Fix: add a condition of manifestapplied for hosted addon.
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:

/cherry-pick release-0.9

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.

@xuezhaojun xuezhaojun deleted the add-manifestapplied-true-condition-for-hosted-addon branch May 16, 2024 02:38
xuezhaojun added a commit to xuezhaojun/addon-framework that referenced this pull request May 16, 2024
openshift-merge-bot bot pushed a commit that referenced this pull request May 16, 2024
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