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

fix: reconcile workers is not effective #6805

Merged
merged 1 commit into from
Mar 12, 2024
Merged

fix: reconcile workers is not effective #6805

merged 1 commit into from
Mar 12, 2024

Conversation

wangyelei
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/XS Denotes a PR that changes 0-9 lines. label Mar 12, 2024
@wangyelei
Copy link
Contributor Author

/approved

@apecloud-bot apecloud-bot added the approved PR Approved Test label Mar 12, 2024
@wangyelei wangyelei merged commit 4852c42 into main Mar 12, 2024
80 of 82 checks passed
@wangyelei wangyelei deleted the bugfix/reconcile_workers_not_effect branch March 12, 2024 11:15
@wangyelei
Copy link
Contributor Author

/cherry-pick release-0.8

@github-actions github-actions bot added this to the Release 0.8.2 milestone Mar 12, 2024
@github-actions GitHub Actions
Copy link

🤖 says: Error cherry-picking.

Auto-merging cmd/manager/main.go
CONFLICT (content): Merge conflict in cmd/manager/main.go
Auto-merging deploy/helm/templates/deployment.yaml
error: could not apply 4852c42... fix: reconcile workers is not effective (#6805)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@github-actions GitHub Actions
Copy link

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/8247873910

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

@ldming ldming ldming approved these changes

@apecloud-bot apecloud-bot apecloud-bot approved these changes

@nayutah nayutah Awaiting requested review from nayutah

@heng4fun heng4fun Awaiting requested review from heng4fun

@free6om free6om Awaiting requested review from free6om

@Y-Rookie Y-Rookie Awaiting requested review from Y-Rookie

Assignees
No one assigned
Labels
approved PR Approved Test ci enhancement size/XS Denotes a PR that changes 0-9 lines.
Projects
None yet
Milestone
Release 0.8.2
Development

Successfully merging this pull request may close these issues.
3 participants
@wangyelei @ldming @apecloud-bot