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

⚠️ check return err for customized agent install namespace #257

Merged

Conversation

zhujian7
Copy link
Member

Summary

This PR changes the RegistrationOption interface:
from

AgentInstallNamespace func(addon *addonapiv1alpha1.ManagedClusterAddOn) string

to

AgentInstallNamespace func(addon *addonapiv1alpha1.ManagedClusterAddOn) (string, error)

we need this error info to determine whether the namespace is empty or an error occurred.

Related issue(s)

Fixes #

@zhujian7
Copy link
Member Author

/hold

@zhujian7
Copy link
Member Author

zhujian7 commented Apr 1, 2024

/assign @qiujian16
/unhold

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

@openshift-ci openshift-ci bot added the lgtm label Apr 2, 2024
Copy link
Contributor

openshift-ci bot commented Apr 2, 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-merge-bot openshift-merge-bot bot merged commit be542a6 into open-cluster-management-io:main Apr 2, 2024
20 of 21 checks passed
@qiujian16
Copy link
Member

/cherrypick release-0.9

@openshift-cherrypick-robot
Copy link
Contributor

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

Applying: check return err for customized agent install namespace
Using index info to reconstruct a base tree...
M	pkg/addonfactory/addonfactory.go
M	pkg/addonfactory/helm_agentaddon.go
M	pkg/addonfactory/template_agentaddon.go
M	pkg/agent/inteface.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/agent/inteface.go
Auto-merging pkg/addonfactory/template_agentaddon.go
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 check return err for customized agent install namespace
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:

/cherrypick 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/test-infra repository.

qiujian16 pushed a commit to qiujian16/addon-framework that referenced this pull request Apr 18, 2024
…ter-management-io#257)

* check return err for customized agent install namespace

Signed-off-by: zhujian <[email protected]>

* Fix e2e

Signed-off-by: zhujian <[email protected]>

* Use default namespace if addon deployment config is not configured

Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
qiujian16 pushed a commit to qiujian16/addon-framework that referenced this pull request Apr 18, 2024
…ter-management-io#257)

* check return err for customized agent install namespace

Signed-off-by: zhujian <[email protected]>

* Fix e2e

Signed-off-by: zhujian <[email protected]>

* Use default namespace if addon deployment config is not configured

Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
qiujian16 pushed a commit to qiujian16/addon-framework that referenced this pull request Apr 18, 2024
…ter-management-io#257)

* check return err for customized agent install namespace

Signed-off-by: zhujian <[email protected]>

* Fix e2e

Signed-off-by: zhujian <[email protected]>

* Use default namespace if addon deployment config is not configured

Signed-off-by: zhujian <[email protected]>

---------

Signed-off-by: zhujian <[email protected]>
Signed-off-by: Jian Qiu <[email protected]>
openshift-merge-bot bot pushed a commit that referenced this pull request Apr 18, 2024
* check return err for customized agent install namespace



* Fix e2e



* Use default namespace if addon deployment config is not configured



---------

Signed-off-by: zhujian <[email protected]>
Signed-off-by: Jian Qiu <[email protected]>
Co-authored-by: Jian Zhu <[email protected]>
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.

3 participants