From 48f3db30515489e707ffa25088bf753e9a9ea4a3 Mon Sep 17 00:00:00 2001 From: EKS Distro PR Bot Date: Tue, 16 Apr 2024 08:59:58 +0000 Subject: [PATCH] Bump opencontainers/runc to latest release --- UPSTREAM_PROJECTS.yaml | 2 +- projects/opencontainers/runc/ATTRIBUTION.txt | 50 ++++++++++---------- projects/opencontainers/runc/CHECKSUMS | 3 +- projects/opencontainers/runc/GIT_TAG | 2 +- projects/opencontainers/runc/README.md | 4 +- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 800ce1ab03..d44c76af4b 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -227,7 +227,7 @@ projects: repos: - name: runc versions: - - tag: v1.1.12 + - tag: v1.2.0-rc.1 go_version: "1.20" - org: prometheus repos: diff --git a/projects/opencontainers/runc/ATTRIBUTION.txt b/projects/opencontainers/runc/ATTRIBUTION.txt index 4ba93156c9..f9e06706fb 100644 --- a/projects/opencontainers/runc/ATTRIBUTION.txt +++ b/projects/opencontainers/runc/ATTRIBUTION.txt @@ -1,29 +1,32 @@ -** github.com/checkpoint-restore/go-criu/v5; version v5.3.0 -- -https://github.com/checkpoint-restore/go-criu/v5 +** github.com/checkpoint-restore/go-criu/v6; version v6.3.0 -- +https://github.com/checkpoint-restore/go-criu/v6 -** github.com/containerd/console; version v1.0.3 -- +** github.com/containerd/console; version v1.0.4 -- https://github.com/containerd/console -** github.com/coreos/go-systemd/v22; version v22.3.2 -- +** github.com/coreos/go-systemd/v22; version v22.5.0 -- https://github.com/coreos/go-systemd/v22 -** github.com/docker/go-units; version v0.4.0 -- +** github.com/docker/go-units; version v0.5.0 -- https://github.com/docker/go-units -** github.com/moby/sys/mountinfo; version v0.5.0 -- +** github.com/moby/sys/mountinfo; version v0.7.1 -- https://github.com/moby/sys/mountinfo +** github.com/moby/sys/user; version v0.1.0 -- +https://github.com/moby/sys/user + ** github.com/mrunalp/fileutils; version v0.5.1 -- https://github.com/mrunalp/fileutils -** github.com/opencontainers/runc; version v1.1.12 -- +** github.com/opencontainers/runc; version v1.2.0-rc.1 -- https://github.com/opencontainers/runc -** github.com/opencontainers/runtime-spec/specs-go; version v1.0.3-0.20210326190908-1c3f411f0417 -- +** github.com/opencontainers/runtime-spec/specs-go; version v1.2.0 -- https://github.com/opencontainers/runtime-spec -** github.com/opencontainers/selinux; version v1.10.0 -- +** github.com/opencontainers/selinux; version v1.11.0 -- https://github.com/opencontainers/selinux ** github.com/vishvananda/netlink; version v1.1.0 -- @@ -255,9 +258,9 @@ The following is courtesy of our legal counsel: Use and transfer of Docker may be subject to certain restrictions by the -United States and other governments. +United States and other governments. It is your responsibility to ensure that your use and/or transfer does not -violate applicable laws. +violate applicable laws. For more information, please see http://www.bis.doc.gov @@ -265,7 +268,7 @@ See also http://www.apache.org/dev/crypto.html and/or seek legal counsel. ------ -** github.com/godbus/dbus/v5; version v5.0.6 -- +** github.com/godbus/dbus/v5; version v5.1.0 -- https://github.com/godbus/dbus/v5 Copyright (c) 2013, Georg Reinke (), Google @@ -296,7 +299,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/russross/blackfriday/v2; version v2.0.1 -- +** github.com/russross/blackfriday/v2; version v2.1.0 -- https://github.com/russross/blackfriday/v2 Blackfriday is distributed under the Simplified BSD License: @@ -398,7 +401,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** golang.org/go; version go1.20.14 -- https://github.com/golang/go -** golang.org/x/sys/unix; version v0.6.0 -- +** golang.org/x/exp; version v0.0.0-20230224173230-c95f2b4c22f2 -- +https://golang.org/x/exp + +** golang.org/x/sys; version v0.18.0 -- https://golang.org/x/sys Copyright (c) 2009 The Go Authors. All rights reserved. @@ -431,7 +437,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** google.golang.org/protobuf; version v1.27.1 -- +** google.golang.org/protobuf; version v1.33.0 -- https://go.googlesource.com/protobuf Copyright (c) 2018 The Go Authors. All rights reserved. @@ -464,27 +470,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** github.com/cilium/ebpf; version v0.7.0 -- +** github.com/cilium/ebpf; version v0.12.3 -- https://github.com/cilium/ebpf Copyright (c) 2017 Nathan Sweet Copyright (c) 2018, 2019 Cloudflare Copyright (c) 2019 Authors of Cilium -** github.com/cpuguy83/go-md2man/v2/md2man; version v2.0.0-20190314233015-f79a8a8ca69d -- +** github.com/cpuguy83/go-md2man/v2/md2man; version v2.0.2 -- https://github.com/cpuguy83/go-md2man/v2 Copyright (c) 2014 Brian Goff -** github.com/shurcooL/sanitized_anchor_name; version v1.0.0 -- -https://github.com/shurcooL/sanitized_anchor_name -Copyright (c) 2015 Dmitri Shuralyov - -** github.com/sirupsen/logrus; version v1.8.1 -- +** github.com/sirupsen/logrus; version v1.9.3 -- https://github.com/sirupsen/logrus Copyright (c) 2014 Simon Eskildsen -** github.com/urfave/cli; version v1.22.1 -- +** github.com/urfave/cli; version v1.22.14 -- https://github.com/urfave/cli -Copyright (c) 2016 Jeremy Saenz & Contributors +Copyright (c) 2023 Jeremy Saenz & Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/projects/opencontainers/runc/CHECKSUMS b/projects/opencontainers/runc/CHECKSUMS index 4073915e9e..85d5b43ed3 100644 --- a/projects/opencontainers/runc/CHECKSUMS +++ b/projects/opencontainers/runc/CHECKSUMS @@ -1,2 +1 @@ -73293358148474f1cd9f6220a5d2d1d3a8af9233822633ca129bc522710b0ab4 _output/bin/runc/linux-amd64/runc -e66c7bf6cec5a91ffea08605214c51f43c68478e788a27cb6fd8daf244af9ef2 _output/bin/runc/linux-arm64/runc +e62303cabb2b2cfac556f30ac7d4a89605725abaece1b35323a0526a837d19cd _output/bin/runc/linux-arm64/runc diff --git a/projects/opencontainers/runc/GIT_TAG b/projects/opencontainers/runc/GIT_TAG index 19f5e1b57e..1bf010be51 100644 --- a/projects/opencontainers/runc/GIT_TAG +++ b/projects/opencontainers/runc/GIT_TAG @@ -1 +1 @@ -v1.1.12 +v1.2.0-rc.1 diff --git a/projects/opencontainers/runc/README.md b/projects/opencontainers/runc/README.md index 4a14d91357..64f4f60a2c 100644 --- a/projects/opencontainers/runc/README.md +++ b/projects/opencontainers/runc/README.md @@ -1,5 +1,5 @@ ## **runc** -![Version](https://img.shields.io/badge/version-v1.1.12-blue) +![Version](https://img.shields.io/badge/version-v1.2.0--rc.1-blue) ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiQ3dHSU45Mnd3bGhzMCtlbGliWXFNcXIxbGx0VDAxVmZqaGtSQ0hXMFN2Rm1DWkNuMG5ibi9GTVRSOFVQK0ZZZW9sUEU4MGJwTzYyVUxEU0lBUG1zVlk4PSIsIml2UGFyYW1ldGVyU3BlYyI6Im5Td1JrV0NEOEh1akJWSXQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main) [runc](https://github.com/opencontainers/runc) is a CLI tool for spawning and running containers on Linux according to the OCI specification. @@ -10,7 +10,7 @@ [repo](https://github.com/opencontainers/runc) and decide on new version. 1. Update the `GIT_TAG` file to have the new desired version based on the upstream release tags. 1. Compare the old tag to the new, looking specifically for Makefile changes. -ex: [1.1.6 compared to 1.1.7](https://github.com/opencontainers/runc/compare/v1.1.6...v1.1.12). Check the release [Makefile](https://github.com/opencontainers/runc/blob/main/Makefile) +ex: [1.1.6 compared to 1.1.7](https://github.com/opencontainers/runc/compare/v1.1.6...v1.2.0--rc.1). Check the release [Makefile](https://github.com/opencontainers/runc/blob/main/Makefile) for any build flag changes, tag changes, dependencies, etc. The [GO_BUILD](https://github.com/opencontainers/runc/blob/main/Makefile#L27) definition should be looked at closely. 1. Verify the golang version has not changed. The version specified in the [Dockerfile](https://github.com/opencontainers/runc/blob/main/Dockerfile#L1) should be considered the source of truth.