merge dev to master #795
Merged
merge dev to master #795
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1. fix apiserver and refactor default apiserver domain 2. add lic file 3. add version types v1 4. add join token logic 5. change dir
* hotfix(master): add infra module
* refactor(dev): sealer infra module same
* refactor(ci): add auto invite (labring#762)
* refactor(ci): add auto invite (labring#762)
* refactor(dev): fix docs site (labring#773) (cherry picked from commit 66b7568) * refactor(master): cloud,app feature close (labring#774) * refactor(master): cloud,app feature close (cherry picked from commit 791cbfd) * refactor(master): cloud,app feature close (labring#774) * refactor(master): cloud,app feature close (cherry picked from commit 791cbfd)
Fixes labring#691 (cherry picked from commit 2b45783) Co-authored-by: ldseraph <ld.seraph@163.com>
(cherry picked from commit e575092)
* merge master to dev Co-authored-by: jiangyanfei <749985146@qq.com> Co-authored-by: louis <38313565+oldthreefeng@users.noreply.github.com> Co-authored-by: ldseraph <ld.seraph@163.com>
* refactor(dev): huawei feature * refactor(dev): huawei feature VPC feature * refactor(dev): types consts to infra module * refactor(dev): add deepCopy * refactor(dev): huawei feature lic
* refactor(ci): add auto invite (labring#762) * refactor(ci): add auto invite (labring#763) * refactor(ci): add auto invite * docs: readme align * refactor(dev): fix docs site (labring#773) * refactor(master): cloud,app feature close (labring#774) * refactor(master): cloud,app feature close * 缺陷: 最新版本sealos init 安装k8s 失败 (labring#778) Fixes labring#691 * refactor(master): release rc.8 (labring#782) * refactor(master): changelog (labring#784) * update changelog to master (labring#785) * refactor(master): changelog * refactor(dev): delete bug printf (labring#790) * refactor(dev): fix merge * refactor(dev): add feature check Co-authored-by: jiangyanfei <749985146@qq.com> Co-authored-by: louis <38313565+oldthreefeng@users.noreply.github.com> Co-authored-by: ldseraph <ld.seraph@163.com>
# Conflicts: # .github/workflows/auto-invite.yml # cmd/cloud.go # cmd/delete.go # cmd/install.go # cmd/version.go # install/cloud.go # install/utils.go # pkg/utils/logger/conn.go # pkg/utils/logger/console.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[SKIP CI]seaols: 一句话简短描述该PR内容