From d1f40a1dae91319e2d7cdd8d36acabe6970a5c35 Mon Sep 17 00:00:00 2001 From: gjmzj Date: Fri, 10 Apr 2020 19:10:30 +0800 Subject: [PATCH] update pause 3.2 --- roles/calico/tasks/main.yml | 6 +++--- roles/cilium/tasks/main.yml | 6 +++--- roles/containerd/defaults/main.yml | 2 +- roles/flannel/tasks/main.yml | 6 +++--- roles/kube-node/defaults/main.yml | 2 +- roles/kube-ovn/tasks/main.yml | 6 +++--- roles/kube-router/tasks/main.yml | 6 +++--- tools/easzup | 7 ++++--- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/roles/calico/tasks/main.yml b/roles/calico/tasks/main.yml index b0e0ca4..acefb1c 100644 --- a/roles/calico/tasks/main.yml +++ b/roles/calico/tasks/main.yml @@ -45,7 +45,7 @@ copy: src={{ base_dir }}/down/{{ item }} dest=/opt/kube/images/{{ item }} when: 'item in download_info.stdout' with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ calico_offline }}" ignore_errors: true @@ -57,7 +57,7 @@ - name: 导入 calico的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/docker load -i /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ calico_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'docker'" @@ -65,7 +65,7 @@ - name: 导入 calico的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/ctr -n=k8s.io images import /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ calico_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'containerd'" diff --git a/roles/cilium/tasks/main.yml b/roles/cilium/tasks/main.yml index 80cd7a2..2a74ea9 100644 --- a/roles/cilium/tasks/main.yml +++ b/roles/cilium/tasks/main.yml @@ -37,7 +37,7 @@ copy: src={{ base_dir }}/down/{{ item }} dest=/opt/kube/images/{{ item }} when: 'item in download_info.stdout' with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ cilium_offline }}" ignore_errors: true @@ -49,7 +49,7 @@ - name: 导入 cilium的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/docker load -i /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ cilium_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'docker'" @@ -57,7 +57,7 @@ - name: 导入 cilium的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/ctr -n=k8s.io images import /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ cilium_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'containerd'" diff --git a/roles/containerd/defaults/main.yml b/roles/containerd/defaults/main.yml index 42d1c56..2ecb0a6 100644 --- a/roles/containerd/defaults/main.yml +++ b/roles/containerd/defaults/main.yml @@ -2,7 +2,7 @@ STORAGE_DIR: "/var/lib/containerd" # 基础容器镜像 -SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1" +SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.2" # 启用容器仓库镜像 ENABLE_MIRROR_REGISTRY: true diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index c88dd47..838fbb8 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -29,7 +29,7 @@ copy: src={{ base_dir }}/down/{{ item }} dest=/opt/kube/images/{{ item }} when: 'item in download_info.stdout' with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ flannel_offline }}" ignore_errors: true @@ -41,7 +41,7 @@ - name: 导入 flannel的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/docker load -i /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ flannel_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'docker'" @@ -49,7 +49,7 @@ - name: 导入 flannel的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/ctr -n=k8s.io images import /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ flannel_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'containerd'" diff --git a/roles/kube-node/defaults/main.yml b/roles/kube-node/defaults/main.yml index af9d0f1..98a8d8a 100644 --- a/roles/kube-node/defaults/main.yml +++ b/roles/kube-node/defaults/main.yml @@ -2,7 +2,7 @@ CLUSTER_DNS_SVC_IP: "{{ SERVICE_CIDR | ipaddr('net') | ipaddr(2) | ipaddr('address') }}" # 基础容器镜像 -SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1" +SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.2" #SANDBOX_IMAGE: "registry.access.redhat.com/rhel7/pod-infrastructure:latest" # Kubelet 根目录 diff --git a/roles/kube-ovn/tasks/main.yml b/roles/kube-ovn/tasks/main.yml index 479eb23..59b3d59 100644 --- a/roles/kube-ovn/tasks/main.yml +++ b/roles/kube-ovn/tasks/main.yml @@ -29,7 +29,7 @@ copy: src={{ base_dir }}/down/{{ item }} dest=/opt/kube/images/{{ item }} when: 'item in download_info.stdout' with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ kube_ovn_offline }}" ignore_errors: true @@ -41,7 +41,7 @@ - name: 导入 kube_ovn的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/docker load -i /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ kube_ovn_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'docker'" @@ -49,7 +49,7 @@ - name: 导入 kube_ovn的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/ctr -n=k8s.io images import /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ kube_ovn_offline }}" ignore_errors: true when: "item in image_info.stdout and CONTAINER_RUNTIME == 'containerd'" diff --git a/roles/kube-router/tasks/main.yml b/roles/kube-router/tasks/main.yml index 07d9dbd..fbbfa94 100644 --- a/roles/kube-router/tasks/main.yml +++ b/roles/kube-router/tasks/main.yml @@ -28,7 +28,7 @@ copy: src={{ base_dir }}/down/{{ item }} dest=/opt/kube/images/{{ item }} when: 'item in download_info.stdout' with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ kuberouter_offline }}" - "{{ busybox_offline }}" ignore_errors: true @@ -41,7 +41,7 @@ - name: 导入 kube-router的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/docker load -i /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ kuberouter_offline }}" - "{{ busybox_offline }}" ignore_errors: true @@ -50,7 +50,7 @@ - name: 导入 kube-router的离线镜像（若执行失败，可忽略） shell: "{{ bin_dir }}/ctr -n=k8s.io images import /opt/kube/images/{{ item }}" with_items: - - "pause_3.1.tar" + - "pause.tar" - "{{ kuberouter_offline }}" - "{{ busybox_offline }}" ignore_errors: true diff --git a/tools/easzup b/tools/easzup index e5e0507..5f4199c 100755 --- a/tools/easzup +++ b/tools/easzup @@ -184,13 +184,13 @@ function get_sys_pkg() { function get_offline_image() { # images needed by k8s cluster - calicoVer=v3.4.4 - corednsVer=1.6.6 + calicoVer=v3.8.4 + corednsVer=1.6.7 dashboardVer=v2.0.0-rc3 dashboardMetricsScraperVer=v1.0.3 flannelVer=v0.11.0-amd64 metricsVer=v0.3.6 - pauseVer=3.1 + pauseVer=3.2 traefikVer=v1.7.20 imageDir=/etc/ansible/down @@ -227,6 +227,7 @@ function get_offline_image() { if [[ ! -f "$imageDir/pause_$pauseVer.tar" ]];then docker pull mirrorgooglecontainers/pause-amd64:${pauseVer} && \ docker save -o ${imageDir}/pause_${pauseVer}.tar mirrorgooglecontainers/pause-amd64:${pauseVer} + /bin/cp -u "${imageDir}/pause_${pauseVer}.tar" "${imageDir}/pause.tar" fi if [[ ! -f "$imageDir/traefik_$traefikVer.tar" ]];then docker pull traefik:${traefikVer} && \