search

open-cluster-management-io / addon-framework

addon apis
Apache License 2.0
23 stars 40 forks source link

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

Closed xuezhaojun closed 4 months ago

xuezhaojun commented 4 months ago

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.

xuezhaojun commented 4 months ago

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

xuezhaojun commented 4 months ago

/assign @qiujian16

qiujian16 commented 4 months ago

/cherry-pick release-0.9

openshift-cherrypick-robot commented 4 months ago

@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](https://github.com/open-cluster-management-io/addon-framework/pull/267#issuecomment-2111398357): >/cherry-pick release-0.9 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
qiujian16 commented 4 months ago

/approve /lgtm

openshift-ci[bot] commented 4 months ago

[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: - ~~[OWNERS](https://github.com/open-cluster-management-io/addon-framework/blob/main/OWNERS)~~ [qiujian16] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-cherrypick-robot commented 4 months ago

@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](https://github.com/open-cluster-management-io/addon-framework/pull/267#issuecomment-2111398357): >/cherry-pick release-0.9 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.