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

pkg/api/types: remove dependencies on nerdctl #2892

Merged

Conversation

sondavidb
Copy link
Contributor

pkg/api/types had a dependency on netutil and imgutil packages. This would create issues with circular dependencies, e.g. in #2638 imgutil could not import types due to its dependency on netutil. This change moves NetworkCreateOptions and RemoteSnapshotterFlags into types to remove any future circular dependencies.

Copy link
Member

@djdongjin djdongjin left a comment

Choose a reason for hiding this comment

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

LGTM on CI green, thanks

@sondavidb sondavidb force-pushed the remove-netutil-imgutil-from-types branch from dbd7979 to 21c8507 Compare March 22, 2024 18:21
@sondavidb
Copy link
Contributor Author

Want to confirm these are just flaky tests? Seems to be similar to other tests failing in the open PRs.

Also sorry @djdongjin I force pushed right after your review so I think it dismissed it 😅

@djdongjin
Copy link
Member

Want to confirm these are just flaky tests? Seems to be similar to other tests failing in the open PRs.

Also sorry @djdongjin I force pushed right after your review so I think it dismissed it 😅

Yeah seems flaky tests, most errrors look related to cosign.

@AkihiroSuda
Copy link
Member

Thanks, could you rebase, then the CI should be green

pkg/api/types had a dependency on netutil and imgutil packages. This
would create issues with circular dependencies, e.g. in containerd#2638 imgutil
could not import types due to its dependency on netutil. This change
moves NetworkCreateOptions and RemoteSnapshotterFlags into types to
remove any future circular dependencies.

This should also help us to clean our function headers, since we no
longer need to explode the options struct into many different pieces.

Signed-off-by: David Son <[email protected]>
@sondavidb sondavidb force-pushed the remove-netutil-imgutil-from-types branch from 21c8507 to 70ee810 Compare March 25, 2024 06:02
@sondavidb
Copy link
Contributor Author

Rebase done, CI looks good.

@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Mar 25, 2024
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit edf7d77 into containerd:main Mar 25, 2024
22 checks passed
@sondavidb sondavidb deleted the remove-netutil-imgutil-from-types branch March 25, 2024 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants