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:cannot get jobs by informer #5656

Merged
merged 1 commit into from
Apr 25, 2023
Merged

Conversation

zhou1203
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes https://github.com/kubesphere/issues/issues/1023

Special notes for reviewers:

Does this PR introduced a user-facing change?

fix:cannot get jobs by informer

Additional documentation, usage docs, etc.:


Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>
@ks-ci-bot ks-ci-bot added release-note kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 25, 2023
@zhou1203 zhou1203 changed the title fix:cannot get jobs by informer Fix:cannot get jobs by informer Apr 25, 2023
@zhou1203
Copy link
Member Author

/cc @wansir @zheng1 @wenxinll

@zhou1203
Copy link
Member Author

/cherry-pick release-3.3

@ks-ci-bot
Copy link
Collaborator

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

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.

@wansir
Copy link
Member

wansir commented Apr 25, 2023

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 149a0886e0013c82700a2a886da2401e9ecebf14

@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 25, 2023
@benjaminhuo
Copy link
Member

/lgtm
/approve

@ks-ci-bot ks-ci-bot merged commit 04f56ee into kubesphere:master Apr 25, 2023
3 checks passed
@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminhuo, wansir, zhou1203

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
Copy link
Collaborator

@zhou1203: #5656 failed to apply on top of branch "release-3.3":

Applying: fix:cannot get jobs by informer
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:cannot get jobs by informer
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

@zhou1203: new issue created for failed cherrypick: #5657

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 pushed a commit that referenced this pull request May 19, 2023
…te (#5693)

* Remove the incorrect custom MarshalJSON method to avoid infinite recursion (#5624)

* Update utils.go (#5615)

* Update utils.go

All build alerting is not working

* Update utils.go

* revert viper version to v1.4.0 (#5626)

* revert viper version to v1.4.0

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* update vendor

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

---------

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* Use the generic Set to replace deprecated methods (#5623)

* Bump github.com/docker/docker from 20.10.23+incompatible to 20.10.24+incompatible (#5627)

fix: Bump github.com/docker/docker from 20.10.23+incompatible to 20.10.24+incompatible

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

* Move struct DynamicOptions to package pkg/server (#5625)

* move struct DynamicOptions to package pkg/server/dynamic_options.go

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* update test types

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

---------

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* Merge multiple duplicate tools files (#5637)

* controller/cluster: retry when updating the KubeFedCluster conflicted (#5653)

* Fix:cannot get jobs by informer (#5656)

fix:cannot get jobs by informer

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* Uniform code format (#5650)

Signed-off-by: sologgfun <857949825@qq.com>

* controller/cluster: improve the process for updating the cluster certificate's expiration date (#5665)

* Bump github.com/emicklei/go-restful-openapi to v2.9.2-0.20230507070325-d6acc08e570c (#5669)

* Fix wrong params naming in openpitrix (#5666)

* refactor: remove usless options (#5671)

refactor: remove useless options

* Improve Unreasonable Comments (#5674)

Signed-off-by: sologgfun <857949825@qq.com>

* Add write operation for dynamic resource (#5601)

add write operation for dynamic resource

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* docs: modified section about style shields display issues in readme (#5677)

* docs: modified section about style shields display issues in readme

* Update README.md

* docs: modified section about style shields display issues in readme-zh (#5678)

* docs: modified section about style shields display issues in readme-zh

* docs: fix readme

* Bump github.com/docker/distribution from 2.8.1+incompatible to 2.8.2+incompatible (#5682)

fix: Bump github.com/docker/distribution from 2.8.1+incompatible to 2.8.2+incompatible

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

* update imports

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* update ut-test

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

* generate iamv1beta1 crd manifests

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>

---------

Signed-off-by: wenhaozhou <wenhaozhou@yunify.com>
Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
Signed-off-by: sologgfun <857949825@qq.com>
Co-authored-by: Xinzhao Xu <z2d@jifangcheng.com>
Co-authored-by: chuan-you <117634014+chuan-you@users.noreply.github.com>
Co-authored-by: hongzhouzi <36416216+hongzhouzi@users.noreply.github.com>
Co-authored-by: AS! <857949825@qq.com>
Co-authored-by: hongming <hongming@kubesphere.io>
Co-authored-by: Xinwei Xiong <86140903+cubxxw@users.noreply.github.com>
wanjunlei pushed a commit to wanjunlei/kubesphere that referenced this pull request Aug 11, 2023
fix:cannot get jobs by informer

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

4 participants