From 99578d1fc794fb36f58f0cbaf54aea56a95c3c60 Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 21 Oct 2022 16:05:38 -0700 Subject: [PATCH 1/2] Update mailmap Signed-off-by: Samuel Karp --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index bbef6770f85c..11dcdc48c088 100644 --- a/.mailmap +++ b/.mailmap @@ -102,6 +102,7 @@ Ross Boucher Ruediger Maass Rui Cao Sakeven Jiang +Samuel Karp Samuel Karp Seth Pellegrino <30441101+sethp-nr@users.noreply.github.com> Shaobao Feng From f1493f6651bd1955217c6ae444761c73e49726f2 Mon Sep 17 00:00:00 2001 From: Samuel Karp Date: Fri, 21 Oct 2022 16:34:25 -0700 Subject: [PATCH 2/2] Prepare release notes for v1.6.9 Signed-off-by: Samuel Karp --- releases/v1.6.9.toml | 33 +++++++++++++++++++++++++++++++++ version/version.go | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 releases/v1.6.9.toml diff --git a/releases/v1.6.9.toml b/releases/v1.6.9.toml new file mode 100644 index 000000000000..a1ae5ca36c6c --- /dev/null +++ b/releases/v1.6.9.toml @@ -0,0 +1,33 @@ +# commit to be tagged for new release +commit = "HEAD" + +project_name = "containerd" +github_repo = "containerd/containerd" +match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$" + +# previous release +previous = "v1.6.8" + +pre_release = false + +preface = """\ +The ninth patch release for containerd 1.6 contains various fixes, reorders the pod setup workflow in the CRI plugin to +prevent CNI resource leaks, and includes a new version of runc. + +### Notable Updates + +* **Update oci.WithDefaultUnixDevices(): remove tun/tap from the default devices** ([#7268](https://github.com/containerd/containerd/pull/7268)) +* **Fix CRI: Do not append []string{""} to command to preserve Docker compatibility** ([#7298](https://github.com/containerd/containerd/pull/7298)) +* **Enhance CRI: ContainerStatus to return container resources** ([#7410](https://github.com/containerd/containerd/pull/7410)) +* **Fix OCI resolver to skip TLS verification for localhost** ([#7438](https://github.com/containerd/containerd/pull/7438) +* **Fix createTarFile: make xattr EPERM non-fatal** ([#7447](https://github.com/containerd/containerd/pull/7447)) +* **Fix CRI plugin to setup pod network after creating the sandbox container** ([#7456](https://github.com/containerd/containerd/pull/7456)) +* **Fix OCI pusher to retry request on writer reset** ([#7461](https://github.com/containerd/containerd/pull/7461)) +* **Fix archive to validate digests before use** ([#7490](https://github.com/containerd/containerd/pull/7490)) +* **Migrate from k8s.gcr.io to registry.k8s.io** ([#7549](https://github.com/containerd/containerd/pull/7549)) +* **Fix CRI: PodSandboxStatus should tolerate missing task** ([#7551](https://github.com/containerd/containerd/pull/7551)) +* **Fix io.containerd.runc.v1: Stats() shouldn't assume s.container is non-nil** ([#7557](https://github.com/containerd/containerd/pull/7557)) +* **Enhance CRI plugin to add logging volume metrics** ([#7571](https://github.com/containerd/containerd/pull/7571)) +* **Add support for CAP_BPF and CAP_PERFMON** ([#7574](https://github.com/containerd/containerd/pull/7574)) + +See the changelog for complete list of changes""" diff --git a/version/version.go b/version/version.go index a4156cb7a6c2..2e05f65bd7fa 100644 --- a/version/version.go +++ b/version/version.go @@ -23,7 +23,7 @@ var ( Package = "github.com/containerd/containerd" // Version holds the complete version number. Filled in at linking time. - Version = "1.6.8+unknown" + Version = "1.6.9+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.