update submodule

zhangguanzhang · Jul 22, 2020 · 92b61bb · 92b61bb
1 parent 793dccf
commit 92b61bb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/03-get-binaries.sh b/03-get-binaries.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-:  ${KUBE_VERSION:=v1.15.12} ${ETCD_version:=v3.3.20} ${FLANNEL_version:=v0.11.0}
+:  ${KUBE_VERSION:=v1.15.12} ${ETCD_version:=v3.3.23} ${FLANNEL_version:=v0.11.0}
 :  ${OS:=linux} ${ARCH:=amd64} ${CNI_VERSION:=v0.8.1} #https://github.com/zhangguanzhang/k8s_bin-docker_cp/tree/develop/sync/cni_plugins/tag
 :  ${CNI_URL:=https://github.com/containernetworking/plugins/releases/download}
 

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ https://github.com/zhangguanzhang/Kubernetes-ansible/wiki/What-I-did
 本次安裝的版本：
 > * Kubernetes v1.15.12 (HA高可用)
 > * CNI plugins v0.8.1
-> * Etcd v3.3.20
+> * Etcd v3.3.23
 > * flanneld v0.11.0
 > * Calico (不写,可以自行去找yaml部署)
 > * Docker CE 19.03

diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -70,7 +70,7 @@ nodeStatusUpdate: Medium
 
 CLUSTER_NAME: 'kubernetes'
 KUBE_VERSION: 'v1.15.12' # 给ds的yaml用，二进制需要改版本的话改下载脚本而不是这里
-ETCD_version: 'v3.3.17'
+ETCD_version: 'v3.3.23'
 
 Net_Choose: flannel  # 暂时只有flannel,后续增加其他的
 

diff --git a/roles b/roles
diff --git a/scripts b/scripts
diff --git a/tasks b/tasks
+1 −0		CoreAddons/defaults/main.yml
+4 −3		CoreAddons/files/flannelkubeconfig.sh
+2 −1		CoreAddons/files/kubeconfig.sh
+2 −1		CoreAddons/templates/coredns.yml.j2
+12 −0		docker/tasks/docker-info.yml
+3 −0		docker/tasks/main.yml
+5 −1		etcd/tasks/etcd.yml
+1 −2		etcd/templates/etcd.config.yml.j2
+1 −0		node/defaults/main.yml