diff --git a/.mailmap b/.mailmap index a3125cda6a06..05740803c78b 100644 --- a/.mailmap +++ b/.mailmap @@ -11,6 +11,7 @@ Alex Ellis Alexander Morozov Antonio Ojea Antonio Ojea +Amir M. Ghazanfari Amit Krishnan Andrei Vagin Andrey Kolomentsev @@ -18,7 +19,6 @@ Arnaud Porterie Arnaud Porterie Bob Mader Boris Popovschi -bot <49699333+dependabot[bot]@users.noreply.github.com> Bowen Yan Brent Baude Cao Zhihao @@ -89,6 +89,7 @@ Kenfe-Mickaƫl Laventure Kevin Kern Kevin Parsons Kevin Xu +Kirtana Ashok Kirtana Ashok Kitt Hsu Kohei Tokunaga @@ -126,6 +127,7 @@ Phil Estes Qian Zhang Reid Li Robin Winkelewski +roman-kiselenko Ross Boucher Ruediger Maass Rui Cao 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 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.