From 1da437b44b33311899c07d8ecd41da4d072e597c Mon Sep 17 00:00:00 2001 From: Saba Touheed Mujawar Date: Thu, 18 May 2023 09:27:22 -0400 Subject: [PATCH] Upgrade runc to 1.1.7 As documented at https://kubernetes.io/blog/2022/12/09/kubernetes-v1-26-release K8s 1.26 will no longer support containerd 1.5 and lower. Accordingly we are upgrading runc to 1.1.7 to be aligned with something closer to what the upstream K8s versions are using. The Debian package for runc comes from "bookworm" and would require us to bring in a newer glibc and newer python3, which is not something we want to do at this point. As a workaround, we are pulling in the prebuilt binaries from the runc github project, which work fine with our existing packages. It's not a compile-time dependency, but these Ansible changes are needed to actually run K8s 1.26: https://review.opendev.org/c/starlingx/ansible-playbooks/+/879356 Test Plan: PASS: Install with K8s 1.26 on AIO-SX and ensure the system comes up normally. Story: 2010368 Task: 46592 Change-Id: Id9380ef1fc0064c311d8901f1d0f3a043ba6e4d4 Signed-off-by: Saba Touheed Mujawar --- kubernetes/runc/debian/deb_folder/changelog | 5 ++++ kubernetes/runc/debian/deb_folder/control | 16 +++++++++++ kubernetes/runc/debian/deb_folder/copyright | 27 +++++++++++++++++++ kubernetes/runc/debian/deb_folder/rules | 7 +++++ .../runc/debian/deb_folder/runc.install | 2 ++ .../runc/debian/deb_folder/source/format | 1 + kubernetes/runc/debian/meta_data.yaml | 13 ++++----- 7 files changed, 65 insertions(+), 6 deletions(-) create mode 100644 kubernetes/runc/debian/deb_folder/changelog create mode 100644 kubernetes/runc/debian/deb_folder/control create mode 100644 kubernetes/runc/debian/deb_folder/copyright create mode 100755 kubernetes/runc/debian/deb_folder/rules create mode 100755 kubernetes/runc/debian/deb_folder/runc.install create mode 100644 kubernetes/runc/debian/deb_folder/source/format diff --git a/kubernetes/runc/debian/deb_folder/changelog b/kubernetes/runc/debian/deb_folder/changelog new file mode 100644 index 000000000..8ce7e0330 --- /dev/null +++ b/kubernetes/runc/debian/deb_folder/changelog @@ -0,0 +1,5 @@ +runc (1.1.7) STABLE; urgency=medium + + * Initial release using binaries from upstream runc package + + -- Saba Touheed Mujawar Mon, 29 May 2023 04:08:15 -0400 diff --git a/kubernetes/runc/debian/deb_folder/control b/kubernetes/runc/debian/deb_folder/control new file mode 100644 index 000000000..6304fb961 --- /dev/null +++ b/kubernetes/runc/debian/deb_folder/control @@ -0,0 +1,16 @@ +Source: runc +Section: admin +Priority: optional +Maintainer: StarlingX Developers +Build-Depends: debhelper-compat (= 13), + dh-exec, +Standards-Version: 4.6.1 +Homepage: https://github.com/opencontainers/runc + +Package: runc +Architecture: linux-any +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Description: runc is a CLI tool for spawning and running containers + on Linux according to the OCI specification. + This package contains the binaries. diff --git a/kubernetes/runc/debian/deb_folder/copyright b/kubernetes/runc/debian/deb_folder/copyright new file mode 100644 index 000000000..737e4ed7a --- /dev/null +++ b/kubernetes/runc/debian/deb_folder/copyright @@ -0,0 +1,27 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: runc +Source: https://github.com/opencontainers/runc + +Files: * +License: Apache-2 + +Other files are included from the upstream runc +binary package at +https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.amd64 + + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". diff --git a/kubernetes/runc/debian/deb_folder/rules b/kubernetes/runc/debian/deb_folder/rules new file mode 100755 index 000000000..12b6d47d5 --- /dev/null +++ b/kubernetes/runc/debian/deb_folder/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +export DH_VERBOSE = 1 + +%: + dh $@ diff --git a/kubernetes/runc/debian/deb_folder/runc.install b/kubernetes/runc/debian/deb_folder/runc.install new file mode 100755 index 000000000..430dc94d7 --- /dev/null +++ b/kubernetes/runc/debian/deb_folder/runc.install @@ -0,0 +1,2 @@ +#!/usr/bin/dh-exec --with=install +runc.amd64 => usr/bin/runc diff --git a/kubernetes/runc/debian/deb_folder/source/format b/kubernetes/runc/debian/deb_folder/source/format new file mode 100644 index 000000000..d3827e75a --- /dev/null +++ b/kubernetes/runc/debian/deb_folder/source/format @@ -0,0 +1 @@ +1.0 diff --git a/kubernetes/runc/debian/meta_data.yaml b/kubernetes/runc/debian/meta_data.yaml index 5e80b3dc2..cc813a2f2 100644 --- a/kubernetes/runc/debian/meta_data.yaml +++ b/kubernetes/runc/debian/meta_data.yaml @@ -1,11 +1,12 @@ --- debname: runc -debver: 1.0.2+ds1-2 -dl_path: - name: runc-debian-1.0.2+ds1-2.tar.gz - url: https://salsa.debian.org/go-team/packages/runc/-/archive/debian/1.0.2+ds1-2/runc-debian-1.0.2+ds1-2.tar.gz - md5sum: b5d8a40e5def530abb66f6555c0f55a7 - sha256sum: 7d4d68f2e9f15881fd55de723ee507fbefc396a184ebbeda0cbc560983fd1689 +debver: 1.1.7 +src_path: null +dl_files: + runc.amd64: + topdir: null + url: https://github.com/opencontainers/runc/releases/download/v1.1.7/runc.amd64 + sha256sum: c3aadb419e5872af49504b6de894055251d2e685fddddb981a79703e7f895cbd revision: dist: $STX_DIST GITREVCOUNT: