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: plugin registry config error #361

Merged
merged 2 commits into from
Nov 11, 2022
Merged

Conversation

Xvv-v
Copy link
Contributor

@Xvv-v Xvv-v commented Nov 10, 2022

Signed-off-by: xu.jingwen xu.jingwen@99cloud.net

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #358

Special notes for reviewers:

Does this PR introduced a user-facing change?


Additional documentation, usage docs, etc.:


Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>
@kubeclipper-bot
Copy link
Collaborator

@Xvv-v: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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.

@kubeclipper-bot kubeclipper-bot added kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes do-not-merge/release-note-label-needed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 10, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #361 (c95100b) into master (d0f93c2) will increase coverage by 0.07%.
The diff coverage is 30.61%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #361      +/-   ##
==========================================
+ Coverage   12.87%   12.94%   +0.07%     
==========================================
  Files         102      102              
  Lines       15734    15737       +3     
==========================================
+ Hits         2025     2037      +12     
+ Misses      13467    13454      -13     
- Partials      242      246       +4     
Impacted Files Coverage Δ
pkg/apis/core/v1/handler.go 0.30% <0.00%> (-0.01%) ⬇️
pkg/cli/registry/registry.go 0.00% <ø> (ø)
pkg/component/nfs/nfs.go 0.57% <0.00%> (+<0.01%) ⬆️
pkg/apis/core/v1/utils.go 58.88% <35.71%> (+4.30%) ⬆️

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>
@x893675
Copy link
Collaborator

x893675 commented Nov 11, 2022

/lgtm
/approve

@kubeclipper-bot kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 11, 2022
@kubeclipper-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 11e7e65d9c82e6cf92c9285399630b4a38a3d27f

@kubeclipper-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: x893675, Xvv-v

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

@kubeclipper-bot kubeclipper-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 11, 2022
@kubeclipper-bot kubeclipper-bot merged commit 8cd3320 into kubeclipper:master Nov 11, 2022
kubeclipper-bot pushed a commit that referenced this pull request Nov 11, 2022
* fix: plugin registry config error (#361)

* fix: plugin registry config error

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

* add function note

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

* Fix not loading on worker node when adding plugins, and optimize code for download + load mirror of plugins

Signed-off-by: zhuzhenfan <981189503@qq.com>

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>
Signed-off-by: zhuzhenfan <981189503@qq.com>
Co-authored-by: Xvv-v <55474221+Xvv-v@users.noreply.github.com>
@x893675
Copy link
Collaborator

x893675 commented Nov 11, 2022

/cherrypick release-1.3

@kubeclipper-bot
Copy link
Collaborator

@x893675: #361 failed to apply on top of branch "release-1.3":

Applying: fix: plugin registry config error
Using index info to reconstruct a base tree...
M	pkg/apis/core/v1/handler.go
M	pkg/apis/core/v1/utils.go
M	pkg/cli/registry/registry.go
M	pkg/clustermanage/kubeadm/provider.go
M	pkg/component/common/check_csi_install.go
A	pkg/component/common/insecure_registry.go
M	pkg/component/interface.go
M	pkg/component/nfs/nfs.go
M	pkg/component/nfscsi/nfs_csi.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/component/nfscsi/nfs_csi.go
CONFLICT (content): Merge conflict in pkg/component/nfscsi/nfs_csi.go
Auto-merging pkg/component/nfs/nfs.go
CONFLICT (content): Merge conflict in pkg/component/nfs/nfs.go
Auto-merging pkg/apis/core/v1/handler.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: plugin registry config error
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-1.3

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.

@kubeclipper-bot
Copy link
Collaborator

@x893675: new issue created for failed cherrypick: #366

In response to this:

/cherrypick release-1.3

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.

Xvv-v added a commit to Xvv-v/kubeclipper that referenced this pull request Nov 11, 2022
* fix: plugin registry config error

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

* add function note

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>
kubeclipper-bot pushed a commit that referenced this pull request Nov 11, 2022
* fix: plugin registry config error (#361)

* fix: plugin registry config error

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

* add function note

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

* cherry-pick format modify

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

* e2e-aio-test modify

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>

Signed-off-by: xu.jingwen <xu.jingwen@99cloud.net>
@Xvv-v Xvv-v deleted the plugin branch November 21, 2022 03:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes do-not-merge/release-note-label-needed kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

plugin registry config error
4 participants