Browse Source

CNI plugins: use last version 0.8.1 (#4878)

* CNI plugins: bump version 0.8.1

* cni plugins : update checksums

* cni : update readme
pull/4892/head
Simon Lelievre 5 years ago
committed by Kubernetes Prow Robot
parent
commit
2849191e67
8 changed files with 13 additions and 12 deletions
  1. 1
      README.md
  2. 12
      roles/download/defaults/main.yml
  3. 2
      roles/kubernetes-apps/network_plugin/cni/tasks/main.yml
  4. 2
      roles/network_plugin/cloud/tasks/main.yml
  5. 2
      roles/network_plugin/cni/tasks/main.yml
  6. 2
      roles/network_plugin/contiv/tasks/main.yml
  7. 2
      roles/network_plugin/kube-router/tasks/main.yml
  8. 2
      roles/network_plugin/weave/tasks/main.yml

1
README.md

@ -113,6 +113,7 @@ Supported Components
- [docker](https://www.docker.com/) v18.06 (see note) - [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) - [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 - Network Plugin
- [cni-plugins](https://github.com/containernetworking/plugins) v0.8.1
- [calico](https://github.com/projectcalico/calico) v3.4.0 - [calico](https://github.com/projectcalico/calico) v3.4.0
- [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
- [cilium](https://github.com/cilium/cilium) v1.3.0 - [cilium](https://github.com/cilium/cilium) v1.3.0

12
roles/download/defaults/main.yml

@ -67,7 +67,7 @@ calico_typha_version: "v3.4.4"
flannel_version: "v0.11.0" flannel_version: "v0.11.0"
flannel_cni_version: "v0.3.0" flannel_cni_version: "v0.3.0"
cni_version: "v0.6.0"
cni_version: "v0.8.1"
weave_version: 2.5.1 weave_version: 2.5.1
pod_infra_version: 3.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" 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" 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" 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 }}" calicoctl_download_url: "https://github.com/projectcalico/calicoctl/releases/download/{{ calico_ctl_version }}/calicoctl-linux-{{ image_arch }}"
# Checksums # Checksums
@ -172,9 +172,9 @@ etcd_binary_checksums:
arm64: c219b254ece7d7e308ae41569fa240dbae2de460bed818ee39b408b73f6360ef arm64: c219b254ece7d7e308ae41569fa240dbae2de460bed818ee39b408b73f6360ef
amd64: 127d4f2097c09d929beb9d3784590cc11102f4b4d4d4da7ad82d5c9e856afd38 amd64: 127d4f2097c09d929beb9d3784590cc11102f4b4d4d4da7ad82d5c9e856afd38
cni_binary_checksums: cni_binary_checksums:
arm: ffb62021d2fc6e1266dc6ef7f2058125b6e6b44c016291a2b04a15ed9b4be70a
arm64: 016bbc989877e35e3cd49fafe11415fb2717e52c74fde6b1650411154cb91b81
amd64: f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d
arm: ae6ddbd87c05a79aceb92e1c8c32d11e302f6fc55045f87f6a3ea7e0268b2fda
arm64: acde854e3def3c776c532ae521c19d8784534918cc56449ff16945a2909bff6d
amd64: e9bfc78acd3ae71be77eb8f3e890cc9078a33cc3797703b8ff2fc3077a232252
calicoctl_binary_checksums: calicoctl_binary_checksums:
arm: arm:
v3.6.1: 0 v3.6.1: 0
@ -343,7 +343,7 @@ downloads:
enabled: true enabled: true
file: true file: true
version: "{{ cni_version }}" 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 }}" sha256: "{{ cni_binary_checksum }}"
url: "{{ cni_download_url }}" url: "{{ cni_download_url }}"
unarchive: false unarchive: false

2
roles/kubernetes-apps/network_plugin/cni/tasks/main.yml

@ -8,7 +8,7 @@
group: root group: root
- name: CNI | Copy cni plugins - name: CNI | Copy cni plugins
unarchive: 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" dest: "/opt/cni/bin"
mode: 0755 mode: 0755
remote_src: yes remote_src: yes

2
roles/network_plugin/cloud/tasks/main.yml

@ -9,7 +9,7 @@
- name: Canal | Copy cni plugins - name: Canal | Copy cni plugins
unarchive: 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" dest: "/opt/cni/bin"
mode: 0755 mode: 0755
remote_src: yes remote_src: yes

2
roles/network_plugin/cni/tasks/main.yml

@ -8,7 +8,7 @@
group: root group: root
- name: CNI | Copy cni plugins - name: CNI | Copy cni plugins
unarchive: 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" dest: "/opt/cni/bin"
mode: 0755 mode: 0755
remote_src: yes remote_src: yes

2
roles/network_plugin/contiv/tasks/main.yml

@ -154,7 +154,7 @@
- name: Contiv | Copy cni plugins - name: Contiv | Copy cni plugins
unarchive: 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" dest: "/opt/cni/bin"
mode: 0755 mode: 0755
remote_src: yes remote_src: yes

2
roles/network_plugin/kube-router/tasks/main.yml

@ -13,7 +13,7 @@
- name: kube-router | Copy cni plugins - name: kube-router | Copy cni plugins
unarchive: 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" dest: "/opt/cni/bin"
mode: 0755 mode: 0755
owner: kube owner: kube

2
roles/network_plugin/weave/tasks/main.yml

@ -10,7 +10,7 @@
- name: Weave | Copy cni plugins - name: Weave | Copy cni plugins
unarchive: 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" dest: "/opt/cni/bin"
mode: 0755 mode: 0755
remote_src: yes remote_src: yes

Loading…
Cancel
Save