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

chore: remove mock StatefulSet in pkg controllerutil&testutil #7174

Merged
merged 2 commits into from
Apr 25, 2024
Merged

chore: remove mock StatefulSet in pkg controllerutil&testutil #7174

merged 2 commits into from
Apr 25, 2024

Conversation

free6om
Copy link
Contributor

@free6om free6om commented Apr 25, 2024

No description provided.

@free6om free6om added this to the Release 0.9.0 milestone Apr 25, 2024
@free6om free6om self-assigned this Apr 25, 2024
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines. label Apr 25, 2024
@free6om free6om changed the title chore: remove mock sts in pkg controllerutil&testutil chore: remove mock StatefulSet in pkg controllerutil&testutil Apr 25, 2024
@apecloud-bot apecloud-bot added the approved PR Approved Test label Apr 25, 2024
@free6om
Copy link
Contributor Author

free6om commented Apr 25, 2024

/approve

@free6om free6om merged commit 8526bf5 into main Apr 25, 2024
59 checks passed
@free6om free6om deleted the support/remove-mock-sts-in-controllerutil branch April 25, 2024 11:59
@free6om
Copy link
Contributor Author

free6om commented Apr 25, 2024

/cherry-pick release-0.9

@github-actions GitHub Actions
Copy link

🤖 says: Error cherry-picking.

Auto-merging pkg/testutil/apps/constant.go
CONFLICT (content): Merge conflict in pkg/testutil/apps/constant.go
error: could not apply 8526bf5... chore: remove mock StatefulSet in pkg controllerutil&testutil (#7174)
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/8832098002

free6om added a commit that referenced this pull request May 14, 2024
@free6om
chore: remove mock StatefulSet in pkg controllerutil&testutil (#7174)
44c6c49 
(cherry picked from commit 8526bf5)
free6om added a commit that referenced this pull request May 14, 2024
@free6om
chore: remove mock StatefulSet in pkg controllerutil&testutil (#7174) (…
3c9b4d8 
…#7335)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@ldming ldming ldming approved these changes

@nayutah nayutah Awaiting requested review from nayutah

@heng4fun heng4fun Awaiting requested review from heng4fun

@wangyelei wangyelei Awaiting requested review from wangyelei wangyelei is a code owner

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

Assignees

@free6om free6om

Labels
approved PR Approved Test size/XL Denotes a PR that changes 500-999 lines.
Projects
None yet
Milestone
Release 0.9.0
Development

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