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.

Sign up for GitHub

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

Jump to bottom

update storageclass-accessor webhook #5927

Merged
merged 1 commit into from
Oct 7, 2023
Merged

update storageclass-accessor webhook #5927

merged 1 commit into from
Oct 7, 2023

Conversation

stoneshi-yunify
Copy link
Member

What type of PR is this?

/kind bug
/kind feature

What this PR does / why we need it:

storageclass-accessor released new version v0.2.4 which fixed some bugs and has some nice features, here need to update the kubesphere caller code

Which issue(s) this PR fixes:

Fixes NA

Special notes for reviewers:

Does this PR introduced a user-facing change?

Fix storageclass-accessor webhook misbehaving problem in some situations

Additional documentation, usage docs, etc.:

@stoneshi-yunify
update storageclass-accessor webhook
6af6966 
Signed-off-by: stoneshi-yunify <stoneshi@kubesphere.io>
@ks-ci-bot ks-ci-bot added release-note kind/bug Categorizes issue or PR as related to a bug. kind/feature Categorizes issue or PR as related to a new feature. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 26, 2023
@wansir
Copy link
Member

wansir commented Oct 7, 2023

/lgtm
/approve

1 similar comment
@wansir
Copy link
Member

wansir commented Oct 7, 2023

/lgtm
/approve

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 7, 2023
@ks-ci-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 5762b32711c9d6d7e61736d3dcc41b56394b1d87

@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stoneshi-yunify, wansir

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

@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 7, 2023
@ks-ci-bot ks-ci-bot merged commit b0812d1 into kubesphere:master Oct 7, 2023
@wansir
Copy link
Member

wansir commented Oct 7, 2023

/cherrypick release-3.4

@ks-ci-bot
Copy link
Collaborator

@wansir: #5927 failed to apply on top of branch "release-3.4":

Applying: update storageclass-accessor webhook
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	staging/src/kubesphere.io/api/go.sum
M	staging/src/kubesphere.io/client-go/go.sum
M	staging/src/kubesphere.io/utils/go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging staging/src/kubesphere.io/utils/go.sum
CONFLICT (content): Merge conflict in staging/src/kubesphere.io/utils/go.sum
Auto-merging staging/src/kubesphere.io/client-go/go.sum
CONFLICT (content): Merge conflict in staging/src/kubesphere.io/client-go/go.sum
Auto-merging staging/src/kubesphere.io/api/go.sum
Auto-merging go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update storageclass-accessor webhook
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-3.4

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.

@ks-ci-bot ks-ci-bot mentioned this pull request Oct 7, 2023
Open
@ks-ci-bot
Copy link
Collaborator

@wansir: new issue created for failed cherrypick: #5932

In response to this:

/cherrypick release-3.4

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wansir wansir Awaiting requested review from wansir

Assignees

@wansir wansir

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stoneshi-yunify @wansir @ks-ci-bot