Skip to content

[release/1.5] Prepare release notes for v1.5.5#5805

Merged
dmcgowan merged 1 commit intocontainerd:release/1.5from
dmcgowan:prepare-1.5.5
Jul 29, 2021
Merged

[release/1.5] Prepare release notes for v1.5.5#5805
dmcgowan merged 1 commit intocontainerd:release/1.5from
dmcgowan:prepare-1.5.5

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Signed-off-by: Derek McGowan <derek@mcg.dev>
@dims
Copy link
Copy Markdown
Member

dims commented Jul 29, 2021

@dmcgowan now that we have the new api module, We should bump the go.mod version numbers away from v0.0.0 to a specific version for this release namely v1.5.5 like so:

(we can change it back to v0.0.0 after we cut the release)

Does this sound right @thaJeztah ?

[dims@dims-a02 08:28] ~/go/src/github.com/containerd/containerd ⟩ git diff
diff --git a/go.mod b/go.mod
index 0252a909e..79e113622 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.1
        github.com/containerd/console v1.0.2
-       github.com/containerd/containerd/api v0.0.0
+       github.com/containerd/containerd/api v1.5.5
        github.com/containerd/continuity v0.1.0
        github.com/containerd/fifo v1.0.0
        github.com/containerd/go-cni v1.0.2
diff --git a/integration/client/go.mod b/integration/client/go.mod
index a19bb2e5b..5d361167b 100644
--- a/integration/client/go.mod
+++ b/integration/client/go.mod
@@ -8,7 +8,7 @@ require (
        github.com/containerd/cgroups v1.0.1
        // the actual version of containerd is replaced with the code at the root of this repository
        github.com/containerd/containerd v1.5.1
-       github.com/containerd/containerd/api v0.0.0
+       github.com/containerd/containerd/api v1.5.5
        github.com/containerd/go-runc v1.0.0
        github.com/containerd/ttrpc v1.0.2
        github.com/containerd/typeurl v1.0.2
diff --git a/vendor/modules.txt b/vendor/modules.txt
index d65832618..176e3df00 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -73,7 +73,7 @@ github.com/containerd/cgroups/v2/stats
 # github.com/containerd/console v1.0.2
 ## explicit
 github.com/containerd/console
-# github.com/containerd/containerd/api v0.0.0 => ./api
+# github.com/containerd/containerd/api v1.5.5 => ./api
 ## explicit
 github.com/containerd/containerd/api/events
 github.com/containerd/containerd/api/services/containers/v1

@thaJeztah
Copy link
Copy Markdown
Member

now that we have the new api module, We should bump the go.mod version numbers away from v0.0.0 to a specific version for this release namely v1.5.5 like so:

The API module is in the main branch, so targeting v1.6.0, correct? Or will existing consumer now automatically pull in the github.com/containerd/containerd/api module? (from main)?

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dmcgowan dmcgowan merged commit 72cec4b into containerd:release/1.5 Jul 29, 2021
@dmcgowan dmcgowan deleted the prepare-1.5.5 branch March 23, 2022 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants