search

open-cluster-management-io / addon-framework

addon apis
Apache License 2.0
23 stars 40 forks source link

:sparkles: refactor setting the helm default variable of hostingClusterCapabilities #251

Closed zhujian7 closed 6 months ago

zhujian7 commented 6 months ago

Summary

Related issue(s)

Fixes #https://github.com/open-cluster-management-io/addon-framework/pull/246#discussion_r1525070990

zhujian7 commented 6 months ago

/cc @mprahl @zhiweiyin318 @qiujian16

zhujian7 commented 6 months ago

/hold

zhiweiyin318 commented 6 months ago

/lgtm

openshift-ci[bot] commented 6 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mprahl, 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: - ~~[OWNERS](https://github.com/open-cluster-management-io/addon-framework/blob/main/OWNERS)~~ [zhujian7] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
mprahl commented 6 months ago

@zhujian7 can this be merged?

zhujian7 commented 6 months ago

/unhold

xuezhaojun commented 4 months ago

/cherry-pick release-0.9

openshift-cherrypick-robot commented 4 months ago

@xuezhaojun: #251 failed to apply on top of branch "release-0.9":

Applying: refactor setting the helm default variable of hostingClusterCapabilities
Using index info to reconstruct a base tree...
M   pkg/addonfactory/addonfactory.go
M   pkg/addonfactory/helm_agentaddon.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/addonfactory/helm_agentaddon.go
CONFLICT (content): Merge conflict in pkg/addonfactory/helm_agentaddon.go
Auto-merging pkg/addonfactory/addonfactory.go
CONFLICT (content): Merge conflict in pkg/addonfactory/addonfactory.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 refactor setting the helm default variable of hostingClusterCapabilities
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/251#issuecomment-2134736303): >/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.