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

✨ refactor setting the helm default variable of hostingClusterCapabilities #251

Conversation

zhujian7
Copy link
Member

Summary

Related issue(s)

Fixes ##246 (comment)

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

/cc @mprahl @zhiweiyin318 @qiujian16

@openshift-ci openshift-ci bot requested a review from mprahl March 15, 2024 07:56
Copy link
Member

@mprahl mprahl left a comment

Choose a reason for hiding this comment

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

This looks good to me!

@zhujian7
Copy link
Member Author

/hold

hostingCluster, err := a.clusterClient.ClusterV1().ManagedClusters().
Get(context.TODO(), hostingClusterName, metav1.GetOptions{})
if err != nil {
klog.Errorf("failed to get hostingCluster %s. err:%v", hostingClusterName, err)
Copy link
Member

Choose a reason for hiding this comment

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

should we ignore err if the hostingCluster is NotFound here ?

Copy link
Member Author

Choose a reason for hiding this comment

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

PTAL

Signed-off-by: zhujian <jiazhu@redhat.com>
@openshift-ci openshift-ci bot removed the lgtm label Mar 18, 2024
@zhiweiyin318
Copy link
Member

/lgtm

Copy link
Contributor

openshift-ci bot commented Mar 18, 2024

[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:

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

@mprahl
Copy link
Member

mprahl commented Mar 20, 2024

@zhujian7 can this be merged?

@zhujian7
Copy link
Member Author

/unhold

@openshift-merge-bot openshift-merge-bot bot merged commit bffb77d into open-cluster-management-io:main Mar 21, 2024
12 checks passed
@xuezhaojun
Copy link
Member

/cherry-pick release-0.9

@openshift-cherrypick-robot
Copy link
Contributor

@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:

/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 pushed a commit to xuezhaojun/addon-framework that referenced this pull request May 28, 2024
…ities (open-cluster-management-io#251)

* refactor setting the helm default variable of hostingClusterCapabilities

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

* add deprecated marks

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

* ignore not found error for getting hosting cluster

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

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
Signed-off-by: xuezhaojun <zxue@redhat.com>
xuezhaojun pushed a commit to xuezhaojun/addon-framework that referenced this pull request May 28, 2024
…ities (open-cluster-management-io#251)

* refactor setting the helm default variable of hostingClusterCapabilities

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

* add deprecated marks

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

* ignore not found error for getting hosting cluster

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

---------

Signed-off-by: zhujian <jiazhu@redhat.com>
Signed-off-by: xuezhaojun <zxue@redhat.com>
openshift-merge-bot bot pushed a commit that referenced this pull request May 29, 2024
…ities (#251) (#272)

* refactor setting the helm default variable of hostingClusterCapabilities



* add deprecated marks



* ignore not found error for getting hosting cluster



---------

Signed-off-by: zhujian <jiazhu@redhat.com>
Signed-off-by: xuezhaojun <zxue@redhat.com>
Co-authored-by: Jian Zhu <jiazhu@redhat.com>
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

5 participants