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: example expose roleSelector specified #7728

Merged
merged 1 commit into from
Jul 4, 2024
Merged

chore: example expose roleSelector specified #7728

merged 1 commit into from
Jul 4, 2024

Conversation

haowen159
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/S Denotes a PR that changes 10-29 lines. label Jul 4, 2024
@JashBook JashBook merged commit 69d27a3 into main Jul 4, 2024
20 of 21 checks passed
@JashBook JashBook deleted the support/expose_roleSelector_specified branch July 4, 2024 09:04
@apecloud-bot apecloud-bot added the approved PR Approved Test label Jul 4, 2024
@github-actions github-actions bot added this to the Release 0.9.0 milestone Jul 4, 2024
@JashBook JashBook changed the title feat: example expose roleSelector specified chore: example expose roleSelector specified Jul 4, 2024
@JashBook
Copy link
Collaborator

JashBook commented Jul 4, 2024

/cherry-pick release-0.9

@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 4, 2024

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): examples/apecloud-mysql/expose-disable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/apecloud-mysql/expose-disable.yaml left in tree.
CONFLICT (modify/delete): examples/apecloud-mysql/expose-enable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/apecloud-mysql/expose-enable.yaml left in tree.
CONFLICT (modify/delete): examples/mongodb/expose-disable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/mongodb/expose-disable.yaml left in tree.
CONFLICT (modify/delete): examples/mongodb/expose-enable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/mongodb/expose-enable.yaml left in tree.
CONFLICT (modify/delete): examples/mysql/expose-disable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/mysql/expose-disable.yaml left in tree.
CONFLICT (modify/delete): examples/mysql/expose-enable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/mysql/expose-enable.yaml left in tree.
CONFLICT (modify/delete): examples/postgresql/expose-disable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/postgresql/expose-disable.yaml left in tree.
CONFLICT (modify/delete): examples/postgresql/expose-enable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/postgresql/expose-enable.yaml left in tree.
CONFLICT (modify/delete): examples/redis/expose-disable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/redis/expose-disable.yaml left in tree.
CONFLICT (modify/delete): examples/redis/expose-enable.yaml deleted in HEAD and modified in 69d27a3 (feat: example expose roleSelector specified (#7728)). Version 69d27a3 (feat: example expose roleSelector specified (#7728)) of examples/redis/expose-enable.yaml left in tree.
error: could not apply 69d27a3... feat: example expose roleSelector specified (#7728)
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".
hint: Disable this message with "git config advice.mergeConflict false"

@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 4, 2024

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

wangyelei pushed a commit that referenced this pull request Jul 11, 2024
@haowen159 @wangyelei
feat: example expose roleSelector specified (#7728)
e46d5ef 
Co-authored-by: haowen159 <dhw@bupt.edu.cn>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JashBook JashBook JashBook approved these changes

@nayutah nayutah Awaiting requested review from nayutah

@ldming ldming Awaiting requested review from ldming

@heng4fun heng4fun Awaiting requested review from heng4fun

@free6om free6om Awaiting requested review from free6om

@wangyelei wangyelei Awaiting requested review from wangyelei

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

@weicao weicao Awaiting requested review from weicao

Assignees
No one assigned
Labels
approved PR Approved Test size/S Denotes a PR that changes 10-29 lines.
Projects
None yet
Milestone
Release 0.9.0
Development

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