Skip to content

Commit

Permalink
minor docs update
Browse files Browse the repository at this point in the history
  • Loading branch information
gjmzj committed Jan 11, 2019
1 parent edd68c7 commit cf1822f
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 12 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
|组件|支持|
|:-|:-|
|OS|Ubuntu 16.04+, CentOS/RedHat 7|
|k8s|v1.8, v1.9, v1.10, v1.11, v1.12|
|k8s|v1.8, v1.9, v1.10, v1.11, v1.12, v1.13|
|etcd|v3.1, v3.2, v3.3|
|docker|17.03.2-ce, 18.06.1-ce|
|network|calico, cilium, flannel, kube-router|
Expand Down Expand Up @@ -74,15 +74,15 @@
<td><a href="docs/guide/harbor.md">harbor</a></td>
<td><a href="docs/guide/helm.md">helm</a></td>
<td><a href="docs/guide/jenkins.md">jenkins</a></td>
<td><a href=""></a></td>
<td><a href="docs/guide/gitlab.md">gitlab</a></td>
<td><a href=""></a></td>
<td><a href=""></a></td>
</tr>
<tr>
<td><strong>应用实践</strong></td>
<td><a href="docs/practice/java_war_app.md">java应用部署</a></td>
<td><a href="docs/practice/es_cluster.md">elasticsearch部署</a></td>
<td><a href=""></a></td>
<td><a href="docs/practice/es_cluster.md">elasticsearch集群</a></td>
<td><a href="docs/practice/mariadb_cluster.md">mariadb集群</a></td>
<td><a href=""></a></td>
<td><a href=""></a></td>
<td><a href=""></a></td>
Expand Down
3 changes: 3 additions & 0 deletions docs/guide/gitlab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# 使用 gitlab 集成 CI/CD

待更新...
3 changes: 3 additions & 0 deletions docs/practice/mariadb_cluster.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# mariadb 数据库集群

待更新...
2 changes: 1 addition & 1 deletion example/hosts.allinone.example
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#集群部署模式:allinone, single-master, multi-master
DEPLOY_MODE=allinone

#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12
#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12, v1.13
K8S_VER="v1.10"

#集群 MASTER IP,自动生成
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.allinone.example.en
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# Cluster Deployment Mode: allinone, single-master, multi-master
DEPLOY_MODE=allinone

# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12
# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12, v1.13
K8S_VER="v1.10"

# Cluster's Master IP, auto generated
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.cloud.example
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#集群部署模式:allinone, single-master, multi-master
DEPLOY_MODE=multi-master

#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12
#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12, v1.13
K8S_VER="v1.10"

# 创建内网云负载均衡,然后配置:前端监听 tcp 8443,后端 tcp 6443,后端节点即 master 节点
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.cloud.example.en
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# Cluster Deployment Mode: allinone, single-master, multi-master
DEPLOY_MODE=multi-master

# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12
# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12, v1.13
K8S_VER="v1.10"

# cloud loadballance service: listen on tcp 8443, with kube-masters(apiservers) as backend servers
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.m-masters.example
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#集群部署模式:allinone, single-master, multi-master
DEPLOY_MODE=multi-master

#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12
#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12, v1.13
K8S_VER="v1.10"

# 集群 MASTER IP即 LB节点VIP地址,为区别与默认apiserver端口,设置VIP监听的服务端口8443
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.m-masters.example.en
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# Cluster Deployment Mode: allinone, single-master, multi-master
DEPLOY_MODE=multi-master

# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12
# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12, v1.13
K8S_VER="v1.10"

# Cluster's Master IP, generated by 'keepalived' daemon on a 'lb' node here
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.s-master.example
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#集群部署模式:allinone, single-master, multi-master
DEPLOY_MODE=single-master

#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12
#集群主版本号,目前支持: v1.8, v1.9, v1.10,v1.11, v1.12, v1.13
K8S_VER="v1.11"

#集群 MASTER IP,自动生成
Expand Down
2 changes: 1 addition & 1 deletion example/hosts.s-master.example.en
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# Cluster Deployment Mode: allinone, single-master, multi-master
DEPLOY_MODE=single-master

# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12
# Versions supported: v1.8, v1.9, v1.10, v1.11, v1.12, v1.13
K8S_VER="v1.11"

# Cluster's Master IP, auto generated
Expand Down

0 comments on commit cf1822f

Please sign in to comment.