mirror of https://github.com/easzlab/kubeasz.git
更新k8s1.8.8
parent
d43f97a579
commit
32e0ae7599
|
@ -16,10 +16,10 @@
|
|||
|
||||
## 组件版本
|
||||
|
||||
1. kubernetes v1.8.6
|
||||
1. etcd v3.2.11
|
||||
1. docker 17.09.1-ce
|
||||
1. calico/node v2.6.3
|
||||
1. kubernetes v1.8.8
|
||||
1. etcd v3.3.1
|
||||
1. docker 17.12.0-ce
|
||||
1. calico/node v2.6.7
|
||||
|
||||
附:集群用到的所有二进制文件已打包好供下载 [https://pan.baidu.com/s/1c4RFaA](https://pan.baidu.com/s/1c4RFaA)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# 主要组件版本
|
||||
|
||||
+ kubernetes v1.9.0
|
||||
+ etcd v3.2.11
|
||||
+ docker 17.09.1-ce
|
||||
+ calico/node v2.6.3
|
||||
+ kubernetes v1.8.8
|
||||
+ etcd v3.3.1
|
||||
+ docker 17.12.0-ce
|
||||
+ calico/node v2.6.7
|
||||
|
|
|
@ -102,7 +102,7 @@ ExecStart={{ bin_dir }}/docker run --net=host --privileged --name=calico-node \
|
|||
-v /run/docker/plugins:/run/docker/plugins \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-v /var/log/calico:/var/log/calico \
|
||||
calico/node:v2.6.3
|
||||
calico/node:v2.6.7
|
||||
ExecStop={{ bin_dir }}/docker rm -f calico-node
|
||||
Restart=always
|
||||
RestartSec=10
|
||||
|
@ -162,12 +162,12 @@ spec:
|
|||
|
||||
### 验证calico网络
|
||||
|
||||
执行calico安装 `ansible-playbook 05.calico.yml` 成功后可以验证如下:(需要等待calico/node:v2.6.3 镜像下载完成,有时候即便上一步已经配置了docker国内加速,还是可能比较慢,建议确认以下容器运行起来以后,再执行后续步骤)
|
||||
执行calico安装 `ansible-playbook 05.calico.yml` 成功后可以验证如下:(需要等待calico/node:v2.6.7 镜像下载完成,有时候即便上一步已经配置了docker国内加速,还是可能比较慢,建议确认以下容器运行起来以后,再执行后续步骤)
|
||||
|
||||
``` bash
|
||||
docker ps
|
||||
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
||||
631dde89eada calico/node:v2.6.3 "start_runit" 10 minutes ago Up 10 minutes calico-node
|
||||
631dde89eada calico/node:v2.6.7 "start_runit" 10 minutes ago Up 10 minutes calico-node
|
||||
```
|
||||
|
||||
**查看网卡和路由信息**
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#!/bin/bash
|
||||
#主要组件版本如下
|
||||
export K8S_VER=v1.8.6
|
||||
export ETCD_VER=v3.2.11
|
||||
export DOCKER_VER=17.09.1-ce
|
||||
export CALICO_VER=v2.6.3
|
||||
export K8S_VER=v1.8.8
|
||||
export ETCD_VER=v3.3.1
|
||||
export DOCKER_VER=17.12.0-ce
|
||||
export CALICO_VER=v2.6.7
|
||||
export DOCKER_COMPOSE=1.18.0
|
||||
export HARBOR=v1.2.2
|
||||
|
||||
|
@ -44,17 +44,17 @@ 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
|
||||
|
@ -64,7 +64,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
|
||||
|
@ -74,12 +74,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
|
||||
|
@ -89,7 +89,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/kube-node/files/docker
|
||||
fi
|
||||
|
|
|
@ -28,7 +28,7 @@ ExecStart={{ bin_dir }}/docker run --net=host --privileged --name=calico-node \
|
|||
-v /run/docker/plugins:/run/docker/plugins \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-v /var/log/calico:/var/log/calico \
|
||||
calico/node:v2.6.3
|
||||
calico/node:v2.6.7
|
||||
ExecStop={{ bin_dir }}/docker rm -f calico-node
|
||||
Restart=always
|
||||
RestartSec=10
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Calico Version v2.6.x
|
||||
# https://docs.projectcalico.org/v2.6/releases
|
||||
# This manifest includes the following component versions:
|
||||
# calico/kube-controllers:v1.0.1
|
||||
# calico/kube-controllers:v1.0.3
|
||||
|
||||
# Create this manifest using kubectl to deploy
|
||||
# the Calico Kubernetes controllers.
|
||||
|
@ -31,8 +31,8 @@ spec:
|
|||
serviceAccountName: calico-kube-controllers
|
||||
containers:
|
||||
- name: calico-kube-controllers
|
||||
#image: quay.io/calico/kube-controllers:v1.0.1
|
||||
image: calico/kube-controllers:v1.0.1
|
||||
#image: quay.io/calico/kube-controllers:v1.0.3
|
||||
image: calico/kube-controllers:v1.0.3
|
||||
env:
|
||||
# Configure the location of your etcd cluster.
|
||||
- name: ETCD_ENDPOINTS
|
||||
|
|
Loading…
Reference in New Issue