fix 清理ipvs产生的网络接口

huanuo-cis · Jul 13, 2018 · 494c810 · 494c810
1 parent 5f07276
commit 494c810
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -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
diff --git a/bin/readme.md 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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# 项目二进制目录

		集群用到的所有二进制文件已打包好供下载 https://pan.baidu.com/s/1c4RFaA