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

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

Merged
merged 1 commit into from Sep 29, 2023

Conversation

sealos-ci-robot
Copy link
Member

@sealos-ci-robot sealos-ci-robot commented Sep 29, 2023

πŸ€– Generated by Copilot at 51a4c11

Summary

πŸ—‘οΈπŸ”€πŸ› οΈ

Removed SendNewCertAndKeyToMasters method from KubeadmRuntime struct. Simplified certificate distribution logic by using sealos join command.

SendNewCertAndKey
Moved to sealos join command
No more duplication

Walkthrough

  • Remove SendNewCertAndKeyToMasters method from KubeadmRuntime struct (link)

Automated changes by create-pull-request GitHub action

Signed-off-by: cuisongliu <cuisongliu@qq.com>
@cuisongliu cuisongliu added this to the v4.3 milestone Sep 29, 2023
@cuisongliu cuisongliu merged commit cb75187 into release-v4.4 Sep 29, 2023
24 of 25 checks passed
@cuisongliu cuisongliu deleted the cherry-pick-release-v4.4-4017 branch September 29, 2023 01:17
@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/runtime/init.go
CONFLICT (content): Merge conflict in pkg/runtime/init.go
error: could not apply cb75187... fix(main): delete clean_unused_func (#4017) (#4018)
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
Copy link
Member Author

πŸ€– says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/6346041632

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants