Browse Source

[nerdctl] upgrade to 0.16.0 (#8484)

* [nerdctl] upgrade nerdctl to 0.16.0

* [nerdctl] add configuration file
pull/8504/head
Cristian Calin 2 years ago
committed by GitHub
parent
commit
5ecb07b59a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 4 deletions
  1. 21
      roles/container-engine/nerdctl/tasks/main.yml
  2. 10
      roles/container-engine/nerdctl/templates/nerdctl.toml.j2
  3. 8
      roles/download/defaults/main.yml
  4. 1
      roles/reset/tasks/main.yml

21
roles/container-engine/nerdctl/tasks/main.yml

@ -10,6 +10,27 @@
dest: "{{ bin_dir }}/nerdctl"
mode: 0755
remote_src: true
owner: root
group: root
become: true
notify:
- Get nerdctl completion
- Install nerdctl completion
- name: nerdctl | Create configuration dir
file:
path: /etc/nerdctl
state: directory
mode: 0755
owner: root
group: root
become: true
- name: nerdctl | Install nerdctl configuration
template:
src: nerdctl.toml.j2
dest: /etc/nerdctl/nerdctl.toml
mode: 0644
owner: root
group: root
become: true

10
roles/container-engine/nerdctl/templates/nerdctl.toml.j2

@ -0,0 +1,10 @@
debug = false
debug_full = false
address = "unix://{{ cri_socket }}"
namespace = "k8s.io"
snapshotter = "native"
cni_path = "/opt/cni/bin"
cni_netconfpath = "/etc/cni/net.d"
cgroup_manager = "{{ kubelet_cgroup_driver | default('systemd') }}"
insecure_registry = {{ (containerd_insecure_registries is defined and containerd_insecure_registries|length>0) | bool | lower }}
hosts_dir = ["/etc/containerd/certs.d"]

8
roles/download/defaults/main.yml

@ -112,7 +112,7 @@ kube_ovn_version: "v1.8.1"
kube_router_version: "v1.4.0"
multus_version: "v3.8"
helm_version: "v3.8.0"
nerdctl_version: "0.15.0"
nerdctl_version: "0.16.0"
krew_version: "v0.4.2"
# Get kubernetes major version (i.e. 1.17.4 => 1.17)
@ -520,11 +520,11 @@ gvisor_containerd_shim_binary_checksums:
nerdctl_archive_checksums:
arm:
0.15.0: 4d3a2e9ecb9efd278313483e85e34e45605f4f8e61805480de440f69a298a649
0.16.0: bb1c336e9a1dab840c83d4d56914c2c060fc35433113e8e111f5075b5480d858
arm64:
0.15.0: 7b79e2e8fd88b71ed4e0563c7e7dd27008b7ac7990ad2206efb012def850d150
0.16.0: 81e0c13e3c3036c1c5ef5d3c2e02c7b3e980e1856d732779b9e4e5afb9df4c6d
amd64:
0.15.0: 1371da3f6bd461f331946654f6dd3ef2ef4b9da0dd7bc5f78ed1166f32ad5adc
0.16.0: 00abb395a6c7c19f2e0612a65e413534b6ec42e995bfbcabd59886b99ca5e43e
containerd_archive_checksums:
arm:

1
roles/reset/tasks/main.yml

@ -272,6 +272,7 @@
- "{{ etcd_config_dir }}"
- /var/log/calico
- /etc/cni
- /etc/nerdctl
- "{{ nginx_config_dir }}"
- /etc/dnsmasq.d
- /etc/dnsmasq.conf

Loading…
Cancel
Save