From 494c810df6c0eda12db0fdc74721c7913793b181 Mon Sep 17 00:00:00 2001 From: gjmzj Date: Fri, 13 Jul 2018 10:00:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=B8=85=E7=90=86ipvs=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E7=BB=9C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 99.clean.yml | 1 + bin/VERSION.md | 5 ----- bin/readme.md | 3 +++ docs/01-创建CA证书和环境配置.md | 5 ----- down/download.sh | 4 ++-- 6 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 bin/VERSION.md create mode 100644 bin/readme.md diff --git a/.gitignore b/.gitignore index 909a20f..22f5b9a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ down/* !down/download.sh !down/offline_images bin/* +!bin/readme.md manifests/kubedns/kubedns.yaml manifests/coredns/coredns.yaml hosts diff --git a/99.clean.yml b/99.clean.yml index a8b24b7..a744e30 100644 --- a/99.clean.yml +++ b/99.clean.yml @@ -110,6 +110,7 @@ ip link del mynet0; \ ip link del kube-bridge; \ ip link del dummy0; \ + ip link del kube-ipvs0; \ systemctl restart networking; \ systemctl restart network" ignore_errors: true diff --git a/bin/VERSION.md b/bin/VERSION.md deleted file mode 100644 index aae4d06..0000000 --- a/bin/VERSION.md +++ /dev/null @@ -1,5 +0,0 @@ -# 主要组件版本 - -+ kubernetes v1.10.2 -+ etcd v3.3.4 -+ docker 18.03.0-ce diff --git a/bin/readme.md b/bin/readme.md new file mode 100644 index 0000000..1901367 --- /dev/null +++ b/bin/readme.md @@ -0,0 +1,3 @@ +# 项目二进制目录 + +集群用到的所有二进制文件已打包好供下载 https://pan.baidu.com/s/1c4RFaA diff --git a/docs/01-创建CA证书和环境配置.md b/docs/01-创建CA证书和环境配置.md index cb26635..55aef50 100644 --- a/docs/01-创建CA证书和环境配置.md +++ b/docs/01-创建CA证书和环境配置.md @@ -174,11 +174,6 @@ Subjects: User system:kube-proxy ``` -### kubedns.yaml 配置生成 - -+ kubedns.yaml文件中部分参数(CLUSTER_DNS_SVC_IP, CLUSTER_DNS_DOMAIN)根据hosts文件设置而定，因此需要用template模块替换参数 -+ 运行本步骤后，在 manifests/kubedns目录下生成 kubedns.yaml 文件，以供后续部署时使用 - ## prepare 角色 ``` bash diff --git a/down/download.sh b/down/download.sh index f7ef2b9..b4a09f8 100644 --- a/down/download.sh +++ b/down/download.sh @@ -1,8 +1,8 @@ #!/bin/bash #主要组件版本如下 export K8S_VER=v1.10.2 -export ETCD_VER=v3.3.4 -export DOCKER_VER=18.03.0-ce +export ETCD_VER=v3.3.8 +export DOCKER_VER=18.03.1-ce export CNI_VER=v0.7.0 export DOCKER_COMPOSE=1.18.0 export HARBOR=v1.2.2