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 #4032

Merged
merged 1 commit into from
Oct 7, 2023

Conversation

sealos-ci-robot
Copy link
Member

@sealos-ci-robot sealos-ci-robot commented Oct 7, 2023

πŸ€– Generated by Copilot at d9afb2b

Summary

πŸ› οΈπŸŒπŸ”§

This file changes the certificate synchronization logic to support masters with different API server ports. It is part of a pull request that adds --apiserver-port flag to sealos init and sealos join.

syncCert adapts
to masters with varied ports
autumn of changes

Walkthrough

  • Use getMasterIPAndPortList instead of getMasterIPList to sync certificates for masters with different API server ports (link)

Automated changes by create-pull-request GitHub action

@cuisongliu cuisongliu added this to the v4.3 milestone Oct 7, 2023
@cuisongliu cuisongliu merged commit c86e7c7 into release-v4.4 Oct 7, 2023
@cuisongliu cuisongliu deleted the cherry-pick-release-v4.4-4031 branch October 7, 2023 05:00
@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/update_cert.go
CONFLICT (content): Merge conflict in pkg/runtime/update_cert.go
error: could not apply c86e7c7... fix: sync cert failed on non default port (#4031) (#4032)
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/6439153841

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.

3 participants