From 7c1fca096d19855cbf3aed07ddaaba5f32f5f2ab Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Tue, 30 Jan 2024 14:51:08 -0800
Subject: [PATCH 1/3] Update migration script based on usage

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 contrib/v2-migrate.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/v2-migrate.sh b/contrib/v2-migrate.sh
index d96a613646f2..ab77f72fde04 100755
--- a/contrib/v2-migrate.sh
+++ b/contrib/v2-migrate.sh
@@ -2,10 +2,11 @@
 set -e
 for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
   #First migrate containerd imports to v2 module
-  perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd(?!\/v2)(\/\S+)?"/$1$2"github.com\/containerd\/containerd\/v2$3"/g' $GOFILE
+  perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd(?!\/v2)(\/\S+)?"( \/\/.*)?$/$1$2"github.com\/containerd\/containerd\/v2$3"$4/g' $GOFILE
 
   #Migrate moved packages
-  perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2"/$1$2"github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE
+  perl -pi -e 's/([\t]|[ ]{2,8}|import )"github\.com\/containerd\/containerd\/v2"/$1containerd "github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE
+  perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )"github\.com\/containerd\/containerd\/v2"/$1$2"github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/content\/local/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/content\/local/g' $GOFILE
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/content/$1$2"github.com\/containerd\/containerd\/v2\/core\/content/g' $GOFILE
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/containers/$1$2"github.com\/containerd\/containerd\/v2\/core\/containers/g' $GOFILE
@@ -68,6 +69,7 @@ for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do
   # Migrate packages split out to their own repository
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/platforms/$1$2"github.com\/containerd\/platforms/g' $GOFILE
   perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/errdefs/$1$2"github.com\/containerd\/errdefs/g' $GOFILE
+  perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/plugin(\/|")/$1$2"github.com\/containerd\/plugin$3/g' $GOFILE
 
   gofmt -s -w $GOFILE
 done

From f5abb63c09f855e431e37482d71467033e4c19b2 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Thu, 1 Feb 2024 21:25:54 -0800
Subject: [PATCH 2/3] Update mailmap

Remove bot mailmap entry since release tool has been updated to ignore names with "[bot]"

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .mailmap | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index a3125cda6a06..05740803c78b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,6 +11,7 @@ Alex Ellis <alexellis2@gmail.com>
 Alexander Morozov <lk4d4math@gmail.com> <lk4d4@docker.com>
 Antonio Ojea <antonio.ojea.garcia@gmail.com> <aojea@google.com>
 Antonio Ojea <antonio.ojea.garcia@gmail.com> <aojea@redhat.com>
+Amir M. Ghazanfari <a.m.ghazanfari76@gmail.com>
 Amit Krishnan <krish.amit@gmail.com> <amit.krishnan@oracle.com>
 Andrei Vagin <avagin@virtuozzo.com> <avagin@openvz.org>
 Andrey Kolomentsev <andrey.kolomentsev@gmail.com>
@@ -18,7 +19,6 @@ Arnaud Porterie <icecrime@gmail.com>
 Arnaud Porterie <icecrime@gmail.com> <arnaud.porterie@docker.com>
 Bob Mader <swapdisk@users.noreply.github.com>
 Boris Popovschi <zyqsempai@mail.ru>
-bot <49699333+dependabot[bot]@users.noreply.github.com>
 Bowen Yan <loneybw@gmail.com>
 Brent Baude <bbaude@redhat.com>
 Cao Zhihao <caozhihao@163.com>
@@ -89,6 +89,7 @@ Kenfe-Mickaël Laventure <mickael.laventure@gmail.com>
 Kevin Kern <kaiwentan@harmonycloud.cn>
 Kevin Parsons <kevpar@microsoft.com> <kevpar@users.noreply.github.com>
 Kevin Xu <cming.xu@gmail.com>
+Kirtana Ashok <kiashok@microsoft.com>
 Kirtana Ashok <kiashok@microsoft.com> <Kirtana.Ashok@microsoft.com>
 Kitt Hsu <kitt.hsu@gmail.com>
 Kohei Tokunaga <ktokunaga.mail@gmail.com>
@@ -126,6 +127,7 @@ Phil Estes <estesp@gmail.com> <estesp@amazon.com>
 Qian Zhang <cosmoer@qq.com>
 Reid Li <reid.li@utexas.edu>
 Robin Winkelewski <w9ncontact@gmail.com>
+roman-kiselenko <roman.kiselenko.dev@gmail.com> <shindu666@gmail.com>
 Ross Boucher <rboucher@gmail.com>
 Ruediger Maass <ruediger.maass@de.ibm.com>
 Rui Cao <ruicao@alauda.io> <ruicao@alauda.io>

From 0d0850af16c9600e04eb7284cdc419e75423b7c3 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Tue, 30 Jan 2024 14:52:01 -0800
Subject: [PATCH 3/3] Prepare v2.0.0-rc.0

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 releases/{v2.0.0-beta.toml => v2.0.0-rc.toml} | 2 +-
 version/version.go                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename releases/{v2.0.0-beta.toml => v2.0.0-rc.toml} (94%)

diff --git a/releases/v2.0.0-beta.toml b/releases/v2.0.0-rc.toml
similarity index 94%
rename from releases/v2.0.0-beta.toml
rename to releases/v2.0.0-rc.toml
index 7f963e845579..e9b0e183dfa5 100644
--- a/releases/v2.0.0-beta.toml
+++ b/releases/v2.0.0-rc.toml
@@ -34,4 +34,4 @@ See also the [Getting Started](https://github.com/containerd/containerd/blob/mai
 override_deps."github.com/containerd/log".previous = "cf9777876edf6a4aa230c739bc7eec5ab8349e9c"
 override_deps."github.com/containerd/plugin".previous = "497c49344a4b9894a7e26497420cb7fa817facba"
 override_deps."github.com/containerd/platforms".previous = "f18f3c661f7de73d5569f61ff72d98dae1c1700a"
-override_deps."github.com/containerd/errdefs".previous = "f18f3c661f7de73d5569f61ff72d98dae1c1700a"
+override_deps."github.com/containerd/errdefs".previous = "e0d1732a5c38bb3b899832b4e66e7bbb2216559f"
diff --git a/version/version.go b/version/version.go
index 6ee2bfe3c1cc..573bf5ac7a22 100644
--- a/version/version.go
+++ b/version/version.go
@@ -23,7 +23,7 @@ var (
 	Package = "github.com/containerd/containerd/v2"
 
 	// Version holds the complete version number. Filled in at linking time.
-	Version = "2.0.0-beta.2+unknown"
+	Version = "2.0.0-rc.0+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.