Skip to content

Commit 38c0c93

Browse files
committed
minor docs update
1 parent c662ba1 commit 38c0c93

9 files changed

+17
-505
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
项目致力于提供快速部署高可用`k8s`集群的工具, 同时也努力成为`k8s`实践、使用的参考书;基于二进制方式部署和利用`ansible-playbook`实现自动化;既提供一键安装脚本, 也可以根据`安装指南`分步执行安装各个组件。
44

55
- **集群特性** `TLS`双向认证、`RBAC`授权、[多Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、支持`Network Policy`、备份恢复
6-
- **集群版本** kubernetes v1.8, v1.9, v1.10, v1.11, v1.12, v1.13, v1.14
6+
- **集群版本** kubernetes v1.11, v1.12, v1.13, v1.14
77
- **操作系统** Ubuntu 16.04+, CentOS/RedHat 7
88
- **运行时** docker 17.03.x-ce, 18.06.x-ce, 18.09.x, [containerd](docs/guide/containerd.md) 1.2.6
99
- **网络** [calico](docs/setup/network-plugin/calico.md), [cilium](docs/setup/network-plugin/cilium.md), [flannel](docs/setup/network-plugin/flannel.md), [kube-ovn](docs/setup/network-plugin/kube-ovn.md), [kube-router](docs/setup/network-plugin/kube-router.md)

bin/readme.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
# Binaries for installing k8s
1+
# Binaries for k8s clusters
22

3-
Binaries can be downloaded at https://pan.baidu.com/s/1c4RFaA, alternatively they can be downloaded from official github repos separately.
3+
For kubeasz 2x and above, binaries are downloaded and managed by 'tools/easzup'.
4+
5+
Alternatively, binaries can be downloaded from the official github repos by referring to the script 'down/download.sh'.

docs/guide/harbor.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@ Habor是由VMWare中国团队开源的容器镜像仓库。事实上,Habor是
1111

1212
### 安装步骤
1313

14-
1. 在ansible控制端下载最新的 [docker-compose](https://github.com/docker/compose/releases) 二进制文件,改名后把它放到项目 `/etc/ansible/bin`目录下(百度云的二进制文件中已包含
14+
1. 在ansible控制端下载最新的 [docker-compose](https://github.com/docker/compose/releases) 二进制文件,改名后把它放到项目 `/etc/ansible/bin`目录(已包含
1515

16-
``` bash
17-
wget https://github.com/docker/compose/releases/download/1.18.0/docker-compose-Linux-x86_64
18-
mv docker-compose-Linux-x86_64 /etc/ansible/bin/docker-compose
19-
```
20-
2. 在ansible控制端下载最新的 [harbor](https://github.com/vmware/harbor/releases) 离线安装包,把它放到项目 `/etc/ansible/down` 目录下,也可以从分享的百度云盘下载
16+
2. 在ansible控制端下载最新的 [harbor](https://github.com/vmware/harbor/releases) 离线安装包,把它放到项目 `/etc/ansible/down` 目录
2117

2218
3. 在ansible控制端编辑/etc/ansible/hosts文件,可以参考 `example`目录下的模板,修改部分举例如下
2319

docs/setup/05-install_kube_node.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
+ docker:运行容器
66
+ kubelet: kube-node上最主要的组件
77
+ kube-proxy: 发布应用服务与负载均衡
8-
+ haproxy:用于请求转发到多个 apiserver,详见[HA 架构](00-planning_and_overall_intro.md)
9-
+ calico: 配置容器网络 (或者 flannel)
8+
+ haproxy:用于请求转发到多个 apiserver,详见[HA-2x 架构](00-planning_and_overall_intro.md#ha-architecture)
9+
+ calico: 配置容器网络 (或者其他网络组件)
1010

1111
``` bash
1212
roles/kube-node/
@@ -28,7 +28,7 @@ roles/kube-node/
2828

2929
### 变量配置文件
3030

31-
详见 roles/kube-node/defaults/main.yml
31+
详见 roles/kube-node/defaults/main.yml,举例以下3个变量配置说明
3232
- 变量`PROXY_MODE`,配置 kube-proxy 服务代理模式 iptables or ipvs
3333
- 变量`KUBE_APISERVER`,根据不同的节点情况,它有三种取值方式
3434
- 变量`MASTER_CHG`,变更 master 节点时会根据它来重新配置 haproxy

docs/setup/06-install_network_plugin.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ Kubernetes Pod的网络是这样创建的:
2525

2626
本项目基于CNI driver 调用各种网络插件来配置kubernetes的网络,常用CNI插件有 `flannel` `calico` `weave`等等,这些插件各有优势,也在互相借鉴学习优点,比如:在所有node节点都在一个二层网络时候,flannel提供hostgw实现,避免vxlan实现的udp封装开销,估计是目前最高效的;calico也针对L3 Fabric,推出了IPinIP的选项,利用了GRE隧道封装;因此这些插件都能适合很多实际应用场景。
2727

28-
项目当前内置支持的网络插件有:`calico` `cilium` `flannel` `kube-router`
28+
项目当前内置支持的网络插件有:`calico` `cilium` `flannel` `kube-ovn` `kube-router`
2929

3030
### 安装讲解
3131

3232
- [安装calico](network-plugin/calico.md)
3333
- [安装cilium](network-plugin/cilium.md)
3434
- [安装flannel](network-plugin/flannel.md)
35+
- [安装kube-ovn](network-plugin/kube-ovn.md)
3536
- [安装kube-router](network-plugin/kube-router.md)
3637

3738
### 参考

docs/setup/kubeasz_on_aliyun.md

-70
This file was deleted.

docs/setup/kubeasz_on_aws_cloud.md

-206
This file was deleted.

0 commit comments

Comments
 (0)