diff --git a/down/offline_images b/down/offline_images index c2d5ae6..3a10a22 100644 --- a/down/offline_images +++ b/down/offline_images @@ -1,34 +1,35 @@ ###---[basic_images ] -# dns-addon + coredns/coredns:1.2.6 + +mirrorgooglecontainers/metrics-server-amd64:v0.3.1 + +calico/node:v3.4.3 +calico/cni:v3.4.3 +calico/kube-controllers:v3.4.3 + +jmgao1983/flannel:v0.11.0-amd64 + +mirrorgooglecontainers/kubernetes-dashboard-amd64:v1.10.1 +mirrorgooglecontainers/heapster-amd64:v1.5.4 + +mirrorgooglecontainers/pause-amd64:3.1 + +###---[extra-images] +# kube-dns mirrorgooglecontainers/k8s-dns-kube-dns-amd64:1.14.13 mirrorgooglecontainers/k8s-dns-dnsmasq-nanny-amd64:1.14.13 mirrorgooglecontainers/k8s-dns-sidecar-amd64:1.14.13 -# metrics-server -mirrorgooglecontainers/metrics-server-amd64:v0.3.1 -# calico -calico/node:v3.4.1 -calico/cni:v3.4.1 -calico/kube-controllers:v3.4.1 # cilium -cilium/cilium:v1.1.4 -# flannel -jmgao1983/flannel:v0.11.0-amd64 +cilium/cilium:v1.4.1 # kube-router cloudnativelabs/kube-router:v0.2.0 -# dashboard -mirrorgooglecontainers/kubernetes-dashboard-amd64:v1.10.0 -# pause -mirrorgooglecontainers/pause-amd64:3.1 -busybox:1.28.4 # traefik ingress traefik:v1.7.4 # heapster mirrorgooglecontainers/heapster-grafana-amd64:v4.4.3 mirrorgooglecontainers/heapster-amd64:v1.5.4 mirrorgooglecontainers/heapster-influxdb-amd64:v1.3.3 - -###---[extra-images] # helm tiller server jmgao1983/tiller:v2.12.3 # efk diff --git a/roles/calico/defaults/main.yml b/roles/calico/defaults/main.yml index 5ead263..85383cf 100644 --- a/roles/calico/defaults/main.yml +++ b/roles/calico/defaults/main.yml @@ -19,7 +19,7 @@ FELIX_LOG_LVL: "warning" IP_AUTODETECTION_METHOD: "can-reach={{ groups.deploy[0] }}" # 更新支持calico 版本: [v3.2.x] [v3.3.x] [v3.4.x] -calico_ver: "v3.4.1" +calico_ver: "v3.4.3" # calico 主版本 calico_ver_main: "{{ calico_ver.split('.')[0] }}.{{ calico_ver.split('.')[1] }}"