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 cri registry #398

Merged
merged 1 commit into from
Nov 16, 2022

Conversation

lyp256
Copy link
Contributor

@lyp256 lyp256 commented Nov 16, 2022

Signed-off-by: lyp256 lyp256@qq.com

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for reviewers:

Does this PR introduced a user-facing change?

None

Additional documentation, usage docs, etc.:


@kubeclipper-bot kubeclipper-bot added kind/bug Categorizes issue or PR as related to a bug. release-note-none dco-signoff: yes size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 16, 2022
Signed-off-by: lyp256 <lyp256@qq.com>
@codecov-commenter
Copy link

Codecov Report

Merging #398 (e2a47ee) into master (d5ad279) will decrease coverage by 0.05%.
The diff coverage is 1.29%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #398      +/-   ##
==========================================
- Coverage   12.23%   12.17%   -0.06%     
==========================================
  Files         102      103       +1     
  Lines       16890    16969      +79     
==========================================
  Hits         2066     2066              
- Misses      14577    14656      +79     
  Partials      247      247              
Impacted Files Coverage Δ
pkg/apis/core/v1/cri_utils.go 0.00% <0.00%> (ø)
pkg/apis/core/v1/handler.go 0.33% <0.00%> (+<0.01%) ⬆️
pkg/apis/core/v1/utils.go 54.24% <100.00%> (ø)

@x893675
Copy link
Collaborator

x893675 commented Nov 16, 2022

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: e4c794d0c42d0864705e8eb5af7db1058a10cc87

@kubeclipper-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lyp256, x893675

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 16, 2022
@x893675
Copy link
Collaborator

x893675 commented Nov 16, 2022

/cherrypick release-1.3

@kubeclipper-bot
Copy link
Collaborator

@x893675: once the present PR merges, I will cherry-pick it on top of release-1.3 in a new PR and assign it to you.

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 kubeclipper-bot merged commit 7517420 into kubeclipper:master Nov 16, 2022
@kubeclipper-bot
Copy link
Collaborator

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

Applying: fix plugin cri registry
Using index info to reconstruct a base tree...
M	pkg/apis/core/v1/handler.go
M	pkg/apis/core/v1/utils.go
M	pkg/apis/core/v1/utils_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apis/core/v1/utils_test.go
Auto-merging pkg/apis/core/v1/utils.go
Auto-merging pkg/apis/core/v1/handler.go
CONFLICT (content): Merge conflict in 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 cri registry
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: #399

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.

lyp256 added a commit to lyp256/kubeclipper that referenced this pull request Nov 16, 2022
Signed-off-by: lyp256 <lyp256@qq.com>

Signed-off-by: lyp256 <lyp256@qq.com>
kubeclipper-bot pushed a commit that referenced this pull request Nov 16, 2022
Signed-off-by: lyp256 <lyp256@qq.com>

Signed-off-by: lyp256 <lyp256@qq.com>

Signed-off-by: lyp256 <lyp256@qq.com>
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 kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none 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.

None yet

4 participants