From ae5328c500f83489708d0168118f99932fa5da20 Mon Sep 17 00:00:00 2001 From: Florian Ruynat <16313165+floryut@users.noreply.github.com> Date: Thu, 10 Sep 2020 12:45:46 +0200 Subject: [PATCH] Update calico to 3.16.1 (#6644) --- README.md | 2 +- roles/download/defaults/main.yml | 5 ++++- roles/network_plugin/calico/templates/calico-node.yml.j2 | 4 ++-- roles/network_plugin/calico/templates/cni-calico.conflist.j2 | 1 + roles/network_plugin/canal/templates/canal-node.yaml.j2 | 4 ++-- roles/network_plugin/canal/templates/cni-canal.conflist.j2 | 1 + 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 63b4c5204..8dbdfe9fc 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Note: Upstart/SysV init based OS types are not supported. - [cri-o](http://cri-o.io/) v1.17 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS) - Network Plugin - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.6 - - [calico](https://github.com/projectcalico/calico) v3.15.2 + - [calico](https://github.com/projectcalico/calico) v3.16.1 - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions) - [cilium](https://github.com/cilium/cilium) v1.8.3 - [contiv](https://github.com/contiv/install) v1.2.1 diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index aebab36c1..7e4404ffb 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -65,7 +65,7 @@ quay_image_repo: "quay.io" # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults # after migration to container download -calico_version: "v3.15.2" +calico_version: "v3.16.1" calico_ctl_version: "{{ calico_version }}" calico_cni_version: "{{ calico_version }}" calico_policy_version: "{{ calico_version }}" @@ -323,14 +323,17 @@ cni_binary_checksums: amd64: 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8 calicoctl_binary_checksums: arm: + v3.16.1: 0 v3.15.2: 0 v3.14.1: 0 v3.13.3: 0 amd64: + v3.16.1: 7c33a841fdf85409c2eee5b287e1212d6c7e82885ec9ffaf690b6019b7b80c1b v3.15.2: 219ae954501cbe15daeda0ad52e13ec65f99c77548c7d3cbfc4ced5c7149fdf1 v3.14.1: 5fe8a7b00a45cf48879eff42b08dcdb85cf0121f3720ac8cbd06566aaa385667 v3.13.3: 570539d436df51bb349bb1a8c6b200a3a6f20803a9d391aa2c5cf19a70a083d4 arm64: + v3.16.1: d3cc8b721a862f0c50273706bf6d38e47ee9b932b8d90a0f0e51280594a6f242 v3.15.2: 49165f9e4ad55402248b578310fcf68a57363f54e66be04ac24be9714899b4d5 v3.14.1: 326da28cb726988029f70fbf3d4de424a4edd9949fd435fad81f2203c93e4c36 v3.13.3: 0c47acd6d200ba1f8348b389cd7a54771542158fef657afc633a30ddad97e272 diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2 index b3c9b2757..14366c33d 100644 --- a/roles/network_plugin/calico/templates/calico-node.yml.j2 +++ b/roles/network_plugin/calico/templates/calico-node.yml.j2 @@ -64,7 +64,7 @@ spec: # and CNI network config file on each node. - name: install-cni image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} - command: ["/install-cni.sh"] + command: ["/opt/cni/bin/install"] env: # Name of the CNI config file to create. - name: CNI_CONF_NAME @@ -97,7 +97,7 @@ spec: {% if calico_version is version('v3.3.0', '>=') and calico_version is version('v3.4.0', '<') %} - name: install-cni image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} - command: ["/install-cni.sh"] + command: ["/opt/cni/bin/install"] env: # Name of the CNI config file to create. - name: CNI_CONF_NAME diff --git a/roles/network_plugin/calico/templates/cni-calico.conflist.j2 b/roles/network_plugin/calico/templates/cni-calico.conflist.j2 index 5a8414a9a..642f4e944 100644 --- a/roles/network_plugin/calico/templates/cni-calico.conflist.j2 +++ b/roles/network_plugin/calico/templates/cni-calico.conflist.j2 @@ -15,6 +15,7 @@ {% endif %} "type": "calico", "log_level": "info", + "log_file_path": "/var/log/calico/cni/cni.log", {% if calico_datastore == "etcd" %} "etcd_endpoints": "{{ etcd_access_addresses }}", "etcd_cert_file": "{{ calico_cert_dir }}/cert.crt", diff --git a/roles/network_plugin/canal/templates/canal-node.yaml.j2 b/roles/network_plugin/canal/templates/canal-node.yaml.j2 index ad3414802..cc9b5ea10 100644 --- a/roles/network_plugin/canal/templates/canal-node.yaml.j2 +++ b/roles/network_plugin/canal/templates/canal-node.yaml.j2 @@ -59,7 +59,7 @@ spec: # and CNI network config file on each node. - name: install-cni image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} - command: ["/install-cni.sh"] + command: ["/opt/cni/bin/install"] env: # Name of the CNI config file to create. - name: CNI_CONF_NAME @@ -83,7 +83,7 @@ spec: {% if calico_version is version('v3.3.0', '>=') and calico_version is version('v3.4.0', '<') %} - name: install-cni image: {{ calico_cni_image_repo }}:{{ calico_cni_image_tag }} - command: ["/install-cni.sh"] + command: ["/opt/cni/bin/install"] env: # Name of the CNI config file to create. - name: CNI_CONF_NAME diff --git a/roles/network_plugin/canal/templates/cni-canal.conflist.j2 b/roles/network_plugin/canal/templates/cni-canal.conflist.j2 index 28125212d..bba1bf7e5 100644 --- a/roles/network_plugin/canal/templates/cni-canal.conflist.j2 +++ b/roles/network_plugin/canal/templates/cni-canal.conflist.j2 @@ -12,6 +12,7 @@ "etcd_cert_file": "{{ canal_cert_dir }}/cert.crt", "etcd_ca_cert_file": "{{ canal_cert_dir }}/ca_cert.crt", "log_level": "info", + "log_file_path": "/var/log/calico/cni/cni.log", "policy": { "type": "k8s" },