From 75097d5188d0e5cb7d7c0473b341be4ff3f53457 Mon Sep 17 00:00:00 2001 From: jmgao Date: Mon, 19 Feb 2018 08:35:59 +0800 Subject: [PATCH] update k8s 1.9.3 --- 07.calico.yml | 2 +- 07.flannel.yml | 2 +- README.md | 8 ++-- bin/VERSION.md | 4 +- docs/quickStart.md | 2 +- down/download.sh | 40 ++++++++++---------- roles/flannel/templates/kube-flannel.yaml.j2 | 8 ++-- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/07.calico.yml b/07.calico.yml index 4719379..2191e6f 100644 --- a/07.calico.yml +++ b/07.calico.yml @@ -1,3 +1,3 @@ - hosts: kube-cluster roles: - - calico + - { role: calico, when: "CLUSTER_NETWORK == 'calico'" } diff --git a/07.flannel.yml b/07.flannel.yml index 25a6b4f..b5a971d 100644 --- a/07.flannel.yml +++ b/07.flannel.yml @@ -1,3 +1,3 @@ - hosts: kube-cluster roles: - - flannel + - { role: flannel, when: "CLUSTER_NETWORK == 'flannel'" } diff --git a/README.md b/README.md index 0e636bb..6bc3c86 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,11 @@ ## 组件版本 -1. kubernetes v1.9.1 -1. etcd v3.2.13 +1. kubernetes v1.9.3 +1. etcd v3.3.1 1. docker 17.12.0-ce -1. calico/node v2.6.5 -1. flannel v0.9.1 +1. calico/node v2.6.7 +1. flannel v0.10.0 + 附：集群用到的所有二进制文件已打包好供下载 [https://pan.baidu.com/s/1c4RFaA](https://pan.baidu.com/s/1c4RFaA) + 注：`Kubernetes v1.8.x` 版本请切换到项目分支 `v1.8`, 若你需要从v1.8 升级至 v1.9，请参考 [升级注意](docs/upgrade.md) diff --git a/bin/VERSION.md b/bin/VERSION.md index 932e12e..636b1dc 100644 --- a/bin/VERSION.md +++ b/bin/VERSION.md @@ -1,5 +1,5 @@ # 主要组件版本 -+ kubernetes v1.9.1 -+ etcd v3.2.13 ++ kubernetes v1.9.3 ++ etcd v3.3.1 + docker 17.12.0-ce diff --git a/docs/quickStart.md b/docs/quickStart.md index fa4abab..dd92273 100644 --- a/docs/quickStart.md +++ b/docs/quickStart.md @@ -53,7 +53,7 @@ mv kubeasz /etc/ansible # 下载已打包好的binaries，并且解压缩到/etc/ansible/bin目录 # 国内请从分享的百度云链接下载 https://pan.baidu.com/s/1c4RFaA # 如果你有合适网络环境也可以按照/down/download.sh自行从官网下载各种tar包到 ./down目录，并执行download.sh -tar zxvf k8s.191.tar.gz +tar zxvf k8s.193.tar.gz mv bin/* /etc/ansible/bin # 配置ansible的hosts文件 cd /etc/ansible diff --git a/down/download.sh b/down/download.sh index 5b36981..a8a7a6b 100644 --- a/down/download.sh +++ b/down/download.sh @@ -1,9 +1,9 @@ #!/bin/bash #主要组件版本如下 -export K8S_VER=v1.9.1 -export ETCD_VER=v3.2.13 +export K8S_VER=v1.9.3 +export ETCD_VER=v3.3.1 export DOCKER_VER=17.12.0-ce -export CNI_VER=v0.6.0 +export CNI_VER=v0.7.0 export DOCKER_COMPOSE=1.18.0 export HARBOR=v1.2.2 @@ -34,24 +34,24 @@ echo "\n----download harbor-offline-installer at:" echo https://github.com/vmware/harbor/releases/download/${HARBOR}/harbor-offline-installer-${HARBOR}.tgz echo "\n----download cni plugins at:" -echo https://github.com/containernetworking/plugins/releases/download/${CNI_VER}/cni-${CNI_VER}.tgz +echo https://github.com/containernetworking/plugins/releases sleep 30 ### 准备证书工具程序 echo "\n准备证书工具程序..." if [ -f "cfssl_linux-amd64" ]; then - mv cfssl_linux-amd64 ../bin/cfssl + mv -f cfssl_linux-amd64 ../bin/cfssl else echo 请先下载https://pkg.cfssl.org/R1.2/cfssl_linux-amd64 fi if [ -f "cfssljson_linux-amd64" ]; then - mv cfssljson_linux-amd64 ../bin/cfssljson + mv -f cfssljson_linux-amd64 ../bin/cfssljson else echo 请先下载https://pkg.cfssl.org/R1.2/cfssljson_linux-amd64 fi if [ -f "cfssl-certinfo_linux-amd64" ]; then - mv cfssl-certinfo_linux-amd64 ../bin/cfssl-certinfo + mv -f cfssl-certinfo_linux-amd64 ../bin/cfssl-certinfo else echo 请先下载https://pkg.cfssl.org/R1.2/cfssl-certinfo_linux-amd64 fi @@ -61,7 +61,7 @@ echo "\n准备etcd二进制程序..." if [ -f "etcd-${ETCD_VER}-linux-amd64.tar.gz" ]; then echo "\nextracting etcd binaries..." tar zxf etcd-${ETCD_VER}-linux-amd64.tar.gz - mv etcd-${ETCD_VER}-linux-amd64/etcd* ../bin + mv -f etcd-${ETCD_VER}-linux-amd64/etcd* ../bin else echo 请先下载etcd-${ETCD_VER}-linux-amd64.tar.gz fi @@ -71,12 +71,12 @@ echo "\n准备kubernetes二进制程序..." if [ -f "kubernetes-server-linux-amd64.tar.gz" ]; then echo "\nextracting kubernetes binaries..." tar zxf kubernetes-server-linux-amd64.tar.gz - mv kubernetes/server/bin/kube-apiserver ../bin - mv kubernetes/server/bin/kube-controller-manager ../bin - mv kubernetes/server/bin/kubectl ../bin - mv kubernetes/server/bin/kubelet ../bin - mv kubernetes/server/bin/kube-proxy ../bin - mv kubernetes/server/bin/kube-scheduler ../bin + mv -f kubernetes/server/bin/kube-apiserver ../bin + mv -f kubernetes/server/bin/kube-controller-manager ../bin + mv -f kubernetes/server/bin/kubectl ../bin + mv -f kubernetes/server/bin/kubelet ../bin + mv -f kubernetes/server/bin/kube-proxy ../bin + mv -f kubernetes/server/bin/kube-scheduler ../bin else echo 请先下载kubernetes-server-linux-amd64.tar.gz fi @@ -86,7 +86,7 @@ echo "\n准备docker二进制程序..." if [ -f "docker-${DOCKER_VER}.tgz" ]; then echo "\nextracting docker binaries..." tar zxf docker-${DOCKER_VER}.tgz - mv docker/docker* ../bin + mv -f docker/docker* ../bin if [ -f "docker/completion/bash/docker" ]; then mv -f docker/completion/bash/docker ../roles/docker/files/docker fi @@ -99,11 +99,11 @@ echo "\n准备cni plugins，仅安装flannel需要，安装calico由容器专门 if [ -f "cni-${CNI_VER}.tgz" ]; then echo "\nextracting cni plugins binaries..." tar zxf cni-${CNI_VER}.tgz - mv bridge ../bin - mv flannel ../bin - mv host-local ../bin - mv loopback ../bin - mv portmap ../bin + mv -f bridge ../bin + mv -f flannel ../bin + mv -f host-local ../bin + mv -f loopback ../bin + mv -f portmap ../bin else echo 请先下载cni-${CNI_VER}.tgz fi diff --git a/roles/flannel/templates/kube-flannel.yaml.j2 b/roles/flannel/templates/kube-flannel.yaml.j2 index 82ef374..760763d 100644 --- a/roles/flannel/templates/kube-flannel.yaml.j2 +++ b/roles/flannel/templates/kube-flannel.yaml.j2 @@ -104,8 +104,8 @@ spec: serviceAccountName: flannel initContainers: - name: install-cni - image: jmgao1983/flannel:v0.9.1-amd64 - #image: quay.io/coreos/flannel:v0.9.1-amd64 + image: jmgao1983/flannel:v0.10.0-amd64 + #image: quay.io/coreos/flannel:v0.10.0-amd64 command: - cp args: @@ -119,8 +119,8 @@ spec: mountPath: /etc/kube-flannel/ containers: - name: kube-flannel - #image: quay.io/coreos/flannel:v0.9.1-amd64 - image: jmgao1983/flannel:v0.9.1-amd64 + #image: quay.io/coreos/flannel:v0.10.0-amd64 + image: jmgao1983/flannel:v0.10.0-amd64 command: - /opt/bin/flanneld args: