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

docs: Automated CherryPick Update for release-v4.4 #4072

Merged
merged 1 commit into from Oct 11, 2023
Merged

docs: Automated CherryPick Update for release-v4.4 #4072

merged 1 commit into from Oct 11, 2023

Conversation

sealos-ci-robot
Copy link
Member

@sealos-ci-robot sealos-ci-robot commented Oct 11, 2023 •
edited by ghost

🤖 Generated by Copilot at d48129b

Summary

🐛🗑️🎲

Fix bug in install processor of sealos that prevents overriding images. Delete existing container with same image name before creating new one.

sealos fixes bug
deletes old container first
then creates new one

Walkthrough

  • Delete existing container before overriding image (link)

Automated changes by create-pull-request GitHub action

@fengxsong
fix: create new container mount when force override (#4068)
d48129b 
Signed-off-by: fengxsong <fengxsong@outlook.com>
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

All modified lines are covered by tests ✅

📢 Thoughts on this report? Let us know!.

@cuisongliu cuisongliu added this to the v4.3 milestone Oct 11, 2023
@cuisongliu cuisongliu merged commit 4242e7c into release-v4.4 Oct 11, 2023
128 checks passed
@cuisongliu cuisongliu deleted the cherry-pick-release-v4.4-4068 branch October 11, 2023 14:06
@sealos-ci-robot
Copy link
Member Author

/cherry-pick release-v4.3

@sealos-ci-robot
Copy link
Member Author

🤖 says: Error cherry-picking.

Auto-merging pkg/apply/processor/install.go
CONFLICT (content): Merge conflict in pkg/apply/processor/install.go
error: could not apply 4242e7c... fix: create new container mount when force override (#4068) (#4072)
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".

@sealos-ci-robot sealos-ci-robot mentioned this pull request Oct 11, 2023
Closed
@sealos-ci-robot
Copy link
Member Author

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/6483680245

cuisongliu pushed a commit to cuisongliu/sealos that referenced this pull request Oct 11, 2023
@sealos-ci-robot @fengxsong @cuisongliu
fix: create new container mount when force override (labring#4068) (l…
e6934f9 
…abring#4072)

Signed-off-by: fengxsong <fengxsong@outlook.com>
Co-authored-by: fengxsong <fengxsong@outlook.com>

(cherry picked from commit 4242e7c)
Signed-off-by: cuisongliu <cuisongliu@qq.com>
cuisongliu pushed a commit to cuisongliu/sealos that referenced this pull request Oct 11, 2023
@sealos-ci-robot @fengxsong @cuisongliu
fix: create new container mount when force override (labring#4068) (l…
9398bb1 
…abring#4072)

Signed-off-by: fengxsong <fengxsong@outlook.com>
Co-authored-by: fengxsong <fengxsong@outlook.com>

(cherry picked from commit 4242e7c)
Signed-off-by: cuisongliu <cuisongliu@qq.com>
cuisongliu added a commit that referenced this pull request Oct 12, 2023
@cuisongliu @sealos-ci-robot @fengxsong
fix: create new container mount when force override (#4068) (#4072) (#…
34236b4 
…4079)

(cherry picked from commit 4242e7c)

Signed-off-by: fengxsong <fengxsong@outlook.com>
Signed-off-by: cuisongliu <cuisongliu@qq.com>
Co-authored-by: sealos-ci-robot <109538726+sealos-ci-robot@users.noreply.github.com>
Co-authored-by: fengxsong <fengxsong@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cuisongliu cuisongliu cuisongliu approved these changes

Assignees
No one assigned
Labels
area/apply sealos run/apply/scale/reset area/lifecycle-management size/XS
Projects
None yet
Milestone
v4.3
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sealos-ci-robot @cuisongliu @fengxsong