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

refine installation logic of redis #1991

Merged
merged 1 commit into from
May 17, 2022
Merged

Conversation

pixiake
Copy link
Collaborator

@pixiake pixiake commented May 17, 2022

What this PR does / why we need it:

refine installation logic of redis.

Signed-off-by: pixiake guofeng@yunify.com

Signed-off-by: pixiake <guofeng@yunify.com>
@ks-ci-bot ks-ci-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2022
@pixiake
Copy link
Collaborator Author

pixiake commented May 17, 2022

/cc @kubesphere/sig-installation

@ks-ci-bot ks-ci-bot requested a review from a team May 17, 2022 09:33
@ks-ci-bot ks-ci-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 17, 2022
@24sama
Copy link
Contributor

24sama commented May 17, 2022

/lgtm

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

LGTM label has been added.

Git tree hash: bfb52df97e254cd822fb2b088e2845994cd67de7

@24sama
Copy link
Contributor

24sama commented May 17, 2022

/approve

@ks-ci-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 24sama, pixiake

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 merged commit 9fdf230 into kubesphere:master May 17, 2022
@pixiake
Copy link
Collaborator Author

pixiake commented May 17, 2022

/cherrypick release-3.3

@ks-ci-bot
Copy link
Collaborator

@pixiake: #1991 failed to apply on top of branch "release-3.3":

Applying: refine installation logic of redis
Using index info to reconstruct a base tree...
M	deploy/cluster-configuration.yaml
Falling back to patching base and 3-way merge...
Auto-merging deploy/cluster-configuration.yaml
CONFLICT (content): Merge conflict in deploy/cluster-configuration.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 refine installation logic of redis
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:

/cherrypick 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

@pixiake: new issue created for failed cherrypick: #1992

In response to this:

/cherrypick 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.

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. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants