Skip to content

Commit 452f98e

Browse files
authored
Fix: runc_version overwrite and bump containerd and runc (#1880)
* Fix: rename containerd_runc_version var to runc_version * chore: bump containerd and runc * chore: bump containerd to v1.7.29 * fix: ignore var-naming for containerd role
1 parent c0fa79c commit 452f98e

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

images/capi/.ansible-lint-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ansible/python.yml name[missing]
77
ansible/python.yml name[play]
88
ansible/roles/containerd/tasks/main.yml name[missing]
99
ansible/roles/containerd/tasks/photon.yml no-changed-when
10+
ansible/roles/containerd/defaults/main.yml var-naming[no-role-prefix]
1011
ansible/roles/ecr_credential_provider/tasks/main.yaml no-changed-when
1112
ansible/roles/ecr_credential_provider/tasks/main.yaml yaml[line-length]
1213
ansible/roles/firstboot/tasks/main.yaml name[missing]

images/capi/ansible/roles/containerd/defaults/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ containerd_gvisor_version: latest
1818
containerd_baseurl: https://github.com/containerd/containerd/releases/download/v{{ containerd_version }}
1919
containerd_filename: "containerd-{{ containerd_version }}-{{ system }}-{{ arch }}.tar.gz"
2020
containerd_url: "{{ containerd_baseurl }}/{{ containerd_filename }}"
21-
containerd_runc_url: "https://github.com/opencontainers/runc/releases/download/v{{ containerd_runc_version }}/runc.{{ arch }}"
22-
containerd_runc_version: "1.2.3"
23-
containerd_runc_checksum_url: "https://github.com/opencontainers/runc/releases/download/v{{ containerd_runc_version }}/runc.sha256sum"
21+
containerd_runc_url: "https://github.com/opencontainers/runc/releases/download/v{{ runc_version }}/runc.{{ arch }}"
22+
runc_version: "1.2.3"
23+
containerd_runc_checksum_url: "https://github.com/opencontainers/runc/releases/download/v{{ runc_version }}/runc.sha256sum"

images/capi/packer/config/containerd.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"containerd_cri_socket": "/var/run/containerd/containerd.sock",
44
"containerd_gvisor_runtime": "false",
55
"containerd_gvisor_version": "latest",
6-
"containerd_version": "1.7.25",
7-
"runc_version": "1.2.3"
6+
"containerd_version": "1.7.29",
7+
"runc_version": "1.2.8"
88
}

0 commit comments

Comments
 (0)