Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/0.1 backport] remove containerd as dependency #58

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 25, 2023

go.mod Outdated
@@ -3,14 +3,6 @@ module github.com/containerd/nri
go 1.14

require (
// when updating containerd, adjust the replace rules accordingly
github.com/containerd/containerd v1.5.0-beta.3
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the version that was used by containerd v1.5.0-beta.3; https://github.com/containerd/containerd/blob/v1.5.0-beta.3/go.mod#L45C2-L45C77

It's 12 commits ahead of runtime-spec v1.0.2; opencontainers/runtime-spec@v1.0.2...e6143ca

We could consider using a tagged release here 🤔

Copy link
Member

Choose a reason for hiding this comment

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

nod to using tagged if possible

Copy link
Member

@klihub klihub left a comment

Choose a reason for hiding this comment

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

If we decide to go ahead with #9107 for the 1.6 branch in containerd then I think this could be the way to do it.

@thaJeztah
Copy link
Member Author

Yes, I definitely think we should consider doing this; it reduces dependency hell if this dependency is somewhere in the tree (and is responsible for the circular dependency). At least I don't think it hurts to have it.

I would still love to see a tagged version for the runtime-spec dependency in it as well (#58 (comment)), but that's slightly more tricky as we'd either downgrade to v1.0.2 (perhaps that's fine as minimum version); or upgrade to v1.1.0, but that's a larger change; opencontainers/runtime-spec@e6143ca...v1.1.0

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

just a nit a question on keeping to tagged if possible..

client.go Outdated
Pid() uint32
}

// Task is ta subset of containerd's Task interface.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// Task is ta subset of containerd's Task interface.
// Task is a subset of containerd's Task interface.

go.mod Outdated
@@ -3,14 +3,6 @@ module github.com/containerd/nri
go 1.14

require (
// when updating containerd, adjust the replace rules accordingly
github.com/containerd/containerd v1.5.0-beta.3
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
Copy link
Member

Choose a reason for hiding this comment

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

nod to using tagged if possible

@thaJeztah thaJeztah mentioned this pull request Nov 9, 2023
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit da8a7e5)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit ae7840b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 0.1_backport_remove_containerd_dependency branch from 9c23d8e to 4275101 Compare November 9, 2023 21:06
@thaJeztah
Copy link
Member Author

fixed the typo (backported #61), and I downgraded the minimum required version of runtime-spec to v1.0.2 (latest tagged version before v1.1.0). containerd 1.6 already depends on a more recent version of the runtime-spec (but uses a non-tagged version).

@mikebrow @samuelkarp PTAL

@thaJeztah
Copy link
Member Author

If this is merged, we can consider tagging a v0.1.1, and I will update my PR in containerd; containerd/containerd#9107

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow merged commit 51b5b48 into containerd:release/0.1 Nov 13, 2023
@thaJeztah thaJeztah deleted the 0.1_backport_remove_containerd_dependency branch November 13, 2023 15:36
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.

4 participants