From 2849191e670064b106dd877b032481f308cf75f1 Mon Sep 17 00:00:00 2001 From: Simon Lelievre Date: Fri, 14 Jun 2019 11:42:23 +0200 Subject: [PATCH] CNI plugins: use last version 0.8.1 (#4878) * CNI plugins: bump version 0.8.1 * cni plugins : update checksums * cni : update readme --- README.md | 1 + roles/download/defaults/main.yml | 12 ++++++------ .../network_plugin/cni/tasks/main.yml | 2 +- roles/network_plugin/cloud/tasks/main.yml | 2 +- roles/network_plugin/cni/tasks/main.yml | 2 +- roles/network_plugin/contiv/tasks/main.yml | 2 +- roles/network_plugin/kube-router/tasks/main.yml | 2 +- roles/network_plugin/weave/tasks/main.yml | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index ac147e391..6c2fe20aa 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ Supported Components - [docker](https://www.docker.com/) v18.06 (see note) - [cri-o](http://cri-o.io/) v1.11.5 (experimental: see [CRI-O Note](docs/cri-o.md). Only on centos based OS) - Network Plugin + - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.1 - [calico](https://github.com/projectcalico/calico) v3.4.0 - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) - [cilium](https://github.com/cilium/cilium) v1.3.0 diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index eb1e583b6..aba82dd69 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -67,7 +67,7 @@ calico_typha_version: "v3.4.4" flannel_version: "v0.11.0" flannel_cni_version: "v0.3.0" -cni_version: "v0.6.0" +cni_version: "v0.8.1" weave_version: 2.5.1 pod_infra_version: 3.1 @@ -80,7 +80,7 @@ multus_version: "v3.1.autoconf" kubeadm_download_url: "https://storage.googleapis.com/kubernetes-release/release/{{ kubeadm_version }}/bin/linux/{{ image_arch }}/kubeadm" hyperkube_download_url: "https://storage.googleapis.com/kubernetes-release/release/{{ kube_version }}/bin/linux/{{ image_arch }}/hyperkube" etcd_download_url: "https://github.com/coreos/etcd/releases/download/{{ etcd_version }}/etcd-{{ etcd_version }}-linux-{{ image_arch }}.tar.gz" -cni_download_url: "https://github.com/containernetworking/plugins/releases/download/{{ cni_version }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" +cni_download_url: "https://github.com/containernetworking/plugins/releases/download/{{ cni_version }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" calicoctl_download_url: "https://github.com/projectcalico/calicoctl/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}" # Checksums @@ -172,9 +172,9 @@ etcd_binary_checksums: arm64: c219b254ece7d7e308ae41569fa240dbae2de460bed818ee39b408b73f6360ef amd64: 127d4f2097c09d929beb9d3784590cc11102f4b4d4d4da7ad82d5c9e856afd38 cni_binary_checksums: - arm: ffb62021d2fc6e1266dc6ef7f2058125b6e6b44c016291a2b04a15ed9b4be70a - arm64: 016bbc989877e35e3cd49fafe11415fb2717e52c74fde6b1650411154cb91b81 - amd64: f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d + arm: ae6ddbd87c05a79aceb92e1c8c32d11e302f6fc55045f87f6a3ea7e0268b2fda + arm64: acde854e3def3c776c532ae521c19d8784534918cc56449ff16945a2909bff6d + amd64: e9bfc78acd3ae71be77eb8f3e890cc9078a33cc3797703b8ff2fc3077a232252 calicoctl_binary_checksums: arm: v3.6.1: 0 @@ -343,7 +343,7 @@ downloads: enabled: true file: true version: "{{ cni_version }}" - dest: "{{local_release_dir}}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + dest: "{{local_release_dir}}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" sha256: "{{ cni_binary_checksum }}" url: "{{ cni_download_url }}" unarchive: false diff --git a/roles/kubernetes-apps/network_plugin/cni/tasks/main.yml b/roles/kubernetes-apps/network_plugin/cni/tasks/main.yml index 9395be204..a061756ae 100644 --- a/roles/kubernetes-apps/network_plugin/cni/tasks/main.yml +++ b/roles/kubernetes-apps/network_plugin/cni/tasks/main.yml @@ -8,7 +8,7 @@ group: root - name: CNI | Copy cni plugins unarchive: - src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" dest: "/opt/cni/bin" mode: 0755 remote_src: yes diff --git a/roles/network_plugin/cloud/tasks/main.yml b/roles/network_plugin/cloud/tasks/main.yml index b63447978..5a680bdb1 100644 --- a/roles/network_plugin/cloud/tasks/main.yml +++ b/roles/network_plugin/cloud/tasks/main.yml @@ -9,7 +9,7 @@ - name: Canal | Copy cni plugins unarchive: - src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" dest: "/opt/cni/bin" mode: 0755 remote_src: yes diff --git a/roles/network_plugin/cni/tasks/main.yml b/roles/network_plugin/cni/tasks/main.yml index 9395be204..a061756ae 100644 --- a/roles/network_plugin/cni/tasks/main.yml +++ b/roles/network_plugin/cni/tasks/main.yml @@ -8,7 +8,7 @@ group: root - name: CNI | Copy cni plugins unarchive: - src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" dest: "/opt/cni/bin" mode: 0755 remote_src: yes diff --git a/roles/network_plugin/contiv/tasks/main.yml b/roles/network_plugin/contiv/tasks/main.yml index dafe2d7ae..fafe1b5bd 100644 --- a/roles/network_plugin/contiv/tasks/main.yml +++ b/roles/network_plugin/contiv/tasks/main.yml @@ -154,7 +154,7 @@ - name: Contiv | Copy cni plugins unarchive: - src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" dest: "/opt/cni/bin" mode: 0755 remote_src: yes diff --git a/roles/network_plugin/kube-router/tasks/main.yml b/roles/network_plugin/kube-router/tasks/main.yml index ee892673f..db223fab2 100644 --- a/roles/network_plugin/kube-router/tasks/main.yml +++ b/roles/network_plugin/kube-router/tasks/main.yml @@ -13,7 +13,7 @@ - name: kube-router | Copy cni plugins unarchive: - src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" dest: "/opt/cni/bin" mode: 0755 owner: kube diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml index f4560568f..f2bd08c9b 100644 --- a/roles/network_plugin/weave/tasks/main.yml +++ b/roles/network_plugin/weave/tasks/main.yml @@ -10,7 +10,7 @@ - name: Weave | Copy cni plugins unarchive: - src: "{{ local_release_dir }}/cni-plugins-{{ image_arch }}-{{ cni_version }}.tgz" + src: "{{ local_release_dir }}/cni-plugins-linux-{{ image_arch }}-{{ cni_version }}.tgz" dest: "/opt/cni/bin" mode: 0755 remote_src: yes