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 failed to cache resources if group version not found #5408

Merged
merged 1 commit into from Dec 9, 2022

Conversation

wansir
Copy link
Member

@wansir wansir commented Dec 9, 2022

What type of PR is this?

/kind bug

What this PR does / why we need it:

If some required CRDs are missing, the resource cache will fail to start.

Does this PR introduced a user-facing change?

None

@ks-ci-bot ks-ci-bot added release-note-none kind/bug Categorizes issue or PR as related to a bug. labels Dec 9, 2022
@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 9, 2022
@iawia002
Copy link
Member

iawia002 commented Dec 9, 2022

/lgtm

@ks-ci-bot ks-ci-bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2022
@ks-ci-bot
Copy link
Collaborator

LGTM label has been added.

Git tree hash: 033b7f93ea2c6a5088fbd826eab62aa7c3091869

@ks-ci-bot ks-ci-bot merged commit 5151556 into kubesphere:master Dec 9, 2022
@wansir
Copy link
Member Author

wansir commented Jan 12, 2023

/cherry-pick release-3.3

@ks-ci-bot
Copy link
Collaborator

@wansir: #5408 failed to apply on top of branch "release-3.3":

Applying: Fix failed to cache resources if group version not found
Using index info to reconstruct a base tree...
M	pkg/apiserver/apiserver.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apiserver/apiserver.go
CONFLICT (content): Merge conflict in pkg/apiserver/apiserver.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 failed to cache resources if group version not found
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-3.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.

@ks-ci-bot
Copy link
Collaborator

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

In response to this:

/cherry-pick release-3.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.

hongzhouzi added a commit to hongzhouzi/kubesphere that referenced this pull request Jan 12, 2023
…p version not found kubesphere#5408

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
ks-ci-bot pushed a commit that referenced this pull request Jan 12, 2023
…p version not found #5408 (#5466)

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
sologgfun pushed a commit to sologgfun/kubesphere that referenced this pull request Apr 24, 2023
wanjunlei pushed a commit to wanjunlei/kubesphere that referenced this pull request Aug 11, 2023
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. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants