forked from easzlab/kubeasz
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
21 additions
and
27 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,15 @@ | ||
## 项目分支说明 | ||
# 项目分支说明 | ||
|
||
目前项目分支为 `master` `v1.9` `v1.8`,说明如下: | ||
|
||
- `master` 分支将尽量使用最新版k8s (v1.10)和相关组件,网络使用`DaemonSet Pod`方式安装,目前提供`calico` `flannel` 可选 | ||
- `v1.9` 分支将尽量使用k8s v1.9的最新小版本和相关组件,网络使用`DaemonSet Pod`方式安装,目前提供`calico` `flannel` 可选 | ||
- `v1.8` 分支将尽量使用k8s v1.8的最新小版本和相关组件,使用`systemd service`方式安装 `calico`网络 | ||
- 为减小维护压力,避免产生混淆,精简项目分支为:`master`, `dev`, `closed`; 原分支`v1.9`取消(可以直接更新至master分支),原分支`v1.8`更名为 `closed`并停止更新。 | ||
|
||
## 项目分支与百度网盘离线包关系 | ||
|
||
- `master` 分支请使用 `k8s.110x.tar.gz` 的安装包 | ||
- `v1.9` 分支请使用 `k8s.19x.tar.gz` 的安装包 | ||
- `v1.8` 分支请使用 `k8s.18x.tar.gz` 的安装包 | ||
- `master` 分支目前支持k8s v1.8/v1.9/v1.10的集群安装,请使用 `k8s.1-x-x.tar.gz` 的安装包 | ||
- `dev` 分支同 `master`的离线安装包 | ||
- `closed` 分支请使用分享链接目录`old/`下的 `k8s.18x.tar.gz` 的安装包(已停止更新) | ||
|
||
## 更新频率和内容 | ||
|
||
- `master` 更新频繁:**相关文档**,**功能特性**,BUG修复,组件更新 | ||
- `v1.9` `v1.8` 较少更新:BUG修复,组件更新 | ||
- `master` 为最新稳定分支,更新相对频繁:**相关文档**,**功能特性**,BUG修复,组件更新 | ||
- `dev` 为开发测试分支,不一定稳定,更新频繁:**相关文档**,**功能特性**,BUG修复,组件更新 | ||
- `closed` 分支已停止更新:仅重要BUG修复,留档保存使用 |
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