From 5df9ec366595f8fdd9c0220b8c8a7a3247e1602e Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 18 Nov 2021 13:33:12 -0800 Subject: [PATCH 1/3] Update release name to use consistent format Signed-off-by: Derek McGowan --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9dab7b859..56681e764 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -130,8 +130,9 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} fail_on_unmatched_files: true + name: containerd ${{ needs.check.outputs.stringver }} draft: false prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }} body_path: ./builds/containerd-release-notes/release-notes.md files: | - builds/release-tars-**/* \ No newline at end of file + builds/release-tars-**/* From f5863e22f419f9c59ed11e3919863b6cbabce085 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 18 Nov 2021 13:48:16 -0800 Subject: [PATCH 2/3] Update API version in go.mod Signed-off-by: Derek McGowan --- go.mod | 2 +- integration/client/go.mod | 2 +- vendor/modules.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c14a00b04..e91a2d5a2 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/containerd/btrfs v1.0.0 github.com/containerd/cgroups v1.0.2 github.com/containerd/console v1.0.3 - github.com/containerd/containerd/api v1.6.0-beta.1 + github.com/containerd/containerd/api v1.6.0-beta.3 github.com/containerd/continuity v0.2.0 github.com/containerd/fifo v1.0.0 github.com/containerd/go-cni v1.1.1-0.20211026134925-aa8bf14323a5 diff --git a/integration/client/go.mod b/integration/client/go.mod index ea9e0bd0a..8591a56e5 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -8,7 +8,7 @@ require ( github.com/containerd/cgroups v1.0.2 // the actual version of containerd is replaced with the code at the root of this repository github.com/containerd/containerd v1.5.7 - github.com/containerd/containerd/api v1.6.0-beta.1 + github.com/containerd/containerd/api v1.6.0-beta.3 github.com/containerd/go-runc v1.0.0 github.com/containerd/ttrpc v1.1.0 github.com/containerd/typeurl v1.0.2 diff --git a/vendor/modules.txt b/vendor/modules.txt index 9f024b921..343d39f59 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -78,7 +78,7 @@ github.com/containerd/cgroups/v2/stats # github.com/containerd/console v1.0.3 ## explicit github.com/containerd/console -# github.com/containerd/containerd/api v1.6.0-beta.1 => ./api +# github.com/containerd/containerd/api v1.6.0-beta.3 => ./api ## explicit github.com/containerd/containerd/api/events github.com/containerd/containerd/api/services/containers/v1 From 674b94c42bc0bf43c12cd90f5673e0639de063da Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 18 Nov 2021 13:33:53 -0800 Subject: [PATCH 3/3] Prepare release notes for v1.6.0-beta.3 Signed-off-by: Derek McGowan --- releases/v1.6.0-beta.toml | 3 +++ version/version.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/releases/v1.6.0-beta.toml b/releases/v1.6.0-beta.toml index 19191a3f0..2bf981434 100644 --- a/releases/v1.6.0-beta.toml +++ b/releases/v1.6.0-beta.toml @@ -24,6 +24,7 @@ support to increase overall compatibility and stability. * **Split task manager into shim and task manager** ([#5918](https://github.com/containerd/containerd/pull/5918)) * **Add runc shim support for core scheduling** ([#6011](https://github.com/containerd/containerd/pull/6011)) * **Update shim client connect attempt to fail fast when shim errors** ([#6031](https://github.com/containerd/containerd/pull/6031)) +* **Add support for absolute path to shim binaries** ([#6206](https://github.com/containerd/containerd/pull/6206)) #### Windows @@ -37,7 +38,9 @@ support to increase overall compatibility and stability. * **Add support for unified resources field for cgroups v2** ([#5627](https://github.com/containerd/containerd/pull/5627)) * **Add IP preference configuration for reporting pod IP** ([#5964](https://github.com/containerd/containerd/pull/5964)) * **Implement new CRI pod sandbox stats API** ([#6113](https://github.com/containerd/containerd/pull/6113)) +* **Add sandbox and container latency metrics** ([#6111](https://github.com/containerd/containerd/pull/6111)) * **Add namespace to ttrpc and grpc plugin connections** ([#6130](https://github.com/containerd/containerd/pull/6130)) +* **Add option to allow ping sockets and privileged ports with no capabilities** ([#6170](https://github.com/containerd/containerd/pull/6170)) #### Other diff --git a/version/version.go b/version/version.go index 516d3f077..3c5ef97c3 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.0-beta.2+unknown" + Version = "1.6.0-beta.3+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.