Skip to content

Conversation

@ktock
Copy link
Member

@ktock ktock commented Nov 4, 2021

The module github.com/containerd/stargz-snapshotter is used by various projects (e.g. BuildKit, k3s, CernVM-FS, ...). We should keep the dependency as minimal as possible.

Though IPFS-related logic is experimental and optional as of now, it contains lots of dependencies. We should avoid adding them to github.com/containerd/stargz-snapshotter.

This commit solves this issue by introducing new sub modules for ipfs-related logic.

  • ipfs: IPFS-related plugins for containerd and stargz-snapshotter
  • cmd: Dependencies of binary commands.

Additionally, ipfs-related logic is eliminated from github.com/containerd/stargz-snapshotter/fs by making the remote resolver logic configurable. IPFS dependencies are included in ipfs and cmd but not in github.com/containerd/stargz-snapshotter.

This also eliminates the dependency to github.com/containerd/containerd/api from github.com/containerd/stargz-snapshotter. This will solve #508.

ipfs/go.sum Outdated
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
Copy link
Member

Choose a reason for hiding this comment

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

Replace this with your fork

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@AkihiroSuda AkihiroSuda merged commit 6b6ca38 into containerd:main Nov 4, 2021
@AkihiroSuda
Copy link
Member

Can we have a new release soon?

@AkihiroSuda
Copy link
Member

(Before that we should update the containerd lib and dedupe the converter pkg)

@ktock ktock deleted the ipfsdeps branch October 7, 2022 13:47
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.

2 participants