Skip to content

[do not merge] rename module to github.com/containerd/containerd/v2#8478

Closed
thaJeztah wants to merge 5 commits intocontainerd:mainfrom
thaJeztah:start_v2
Closed

[do not merge] rename module to github.com/containerd/containerd/v2#8478
thaJeztah wants to merge 5 commits intocontainerd:mainfrom
thaJeztah:start_v2

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented May 4, 2023

The main branch is now targeting v2, so must be renamed.

This PR is a (mostly manual) attempt to rename the module;

  • make proto failed on many aspects (files were generated into a v2 directory, and go-fix-acronym failed finding files
  • because of circular dependencies, make vendor would pull in containerd v1.6.9; I tried replacing it for the main module, but that won't work for the integration/client, so things likely will fail there
  • in short: this will probably explode currently, but let's give it a try

thaJeztah added 4 commits May 5, 2023 00:38
@thaJeztah
rename module to github.com/containerd/containerd/v2
dcc92e7 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
revert .proto imports
57468da 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
fix go-fix-acronym
965d1b9 
files are generated in the v2/ directory (to be fixed)

    go-fix-acronym: open api//types/platform.pb.go: no such file or directory

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
go.mod: try replacing with local files
5b91cca 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented May 4, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@thaJeztah
Revert "go.mod: try replacing with local files"
feca61b 
This reverts commit 5b91cca.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented May 4, 2023

This is gonna be a lot of fun;

  Error: could not import github.com/containerd/containerd/v2/pkg/cri/server (-: # github.com/containerd/containerd/v2/pkg/cri/server
  Error: pkg/cri/server/image_pull.go:550:59: cannot use decUnpackOpt (variable of type "github.com/containerd/containerd".UnpackOpt) as "github.com/containerd/containerd/v2".UnpackOpt value in array or slice literal) (typecheck)
  Error: could not import github.com/containerd/containerd/v2/pkg/cri/server (-: # github.com/containerd/containerd/v2/pkg/cri/server
  Error: pkg/cri/server/image_pull.go:550:59: cannot use decUnpackOpt (variable of type "github.com/containerd/containerd".UnpackOpt) as "github.com/containerd/containerd/v2".UnpackOpt value in array or slice literal) (typecheck)
  Error: could not import github.com/containerd/containerd/v2/pkg/cri/sbserver/images (-: # github.com/containerd/containerd/v2/pkg/cri/sbserver/images
  Error: pkg/cri/sbserver/images/image_pull.go:578:59: cannot use decUnpackOpt (variable of type "github.com/containerd/containerd".UnpackOpt) as "github.com/containerd/containerd/v2".UnpackOpt value in array or slice literal) (typecheck)
  Error: could not import github.com/containerd/containerd/v2/pkg/cri/sbserver/podsandbox (-: # github.com/containerd/containerd/v2/pkg/cri/sbserver/podsandbox
  Error: pkg/cri/sbserver/podsandbox/sandbox_run.go:254:44: cannot use task (variable of type "github.com/containerd/containerd/v2".Task) as "github.com/containerd/containerd".Task value in argument to nric.InvokeWithSandbox: "github.com/containerd/containerd/v2".Task does not implement "github.com/containerd/containerd".Task (wrong type for method Checkpoint)
  		have Checkpoint(context.Context, ..."github.com/containerd/containerd/v2".CheckpointTaskOpts) ("github.com/containerd/containerd/v2".Image, error)
  		want Checkpoint(context.Context, ..."github.com/containerd/containerd".CheckpointTaskOpts) ("github.com/containerd/containerd".Image, error)
  Error: pkg/cri/sbserver/podsandbox/opts.go:46:44: cannot use task (variable of type "github.com/containerd/containerd/v2".Task) as "github.com/containerd/containerd".Task value in argument to nric.InvokeWithSandbox: "github.com/containerd/containerd/v2".Task does not implement "github.com/containerd/containerd".Task (wrong type for method Checkpoint)
  		have Checkpoint(context.Context, ..."github.com/containerd/containerd/v2".CheckpointTaskOpts) ("github.com/containerd/containerd/v2".Image, error)
  		want Checkpoint(context.Context, ..."github.com/containerd/containerd".CheckpointTaskOpts) ("github.com/containerd/containerd".Image, error)) (typecheck)
  Error: : # github.com/containerd/containerd/v2/pkg/cri/sbserver/images [github.com/containerd/containerd/v2/pkg/cri/sbserver/images.test]
  Error: pkg/cri/sbserver/images/image_pull.go:578:59: cannot use decUnpackOpt (variable of type "github.com/containerd/containerd".UnpackOpt) as "github.com/containerd/containerd/v2".UnpackOpt value in array or slice literal (typecheck)
  Error: : # github.com/containerd/containerd/v2/pkg/cri/sbserver/podsandbox [github.com/containerd/containerd/v2/pkg/cri/sbserver/podsandbox.test]
  Error: pkg/cri/sbserver/podsandbox/sandbox_run.go:254:44: cannot use task (variable of type "github.com/containerd/containerd/v2".Task) as "github.com/containerd/containerd".Task value in argument to nric.InvokeWithSandbox: "github.com/containerd/containerd/v2".Task does not implement "github.com/containerd/containerd".Task (wrong type for method Checkpoint)
  		have Checkpoint(context.Context, ..."github.com/containerd/containerd/v2".CheckpointTaskOpts) ("github.com/containerd/containerd/v2".Image, error)
  		want Checkpoint(context.Context, ..."github.com/containerd/containerd".CheckpointTaskOpts) ("github.com/containerd/containerd".Image, error)
  Error: pkg/cri/sbserver/podsandbox/opts.go:46:44: cannot use task (variable of type "github.com/containerd/containerd/v2".Task) as "github.com/containerd/containerd".Task value in argument to nric.InvokeWithSandbox: "github.com/containerd/containerd/v2".Task does not implement "github.com/containerd/containerd".Task (wrong type for method Checkpoint)
  		have Checkpoint(context.Context, ..."github.com/containerd/containerd/v2".CheckpointTaskOpts) ("github.com/containerd/containerd/v2".Image, error)
  		want Checkpoint(context.Context, ..."github.com/containerd/containerd".CheckpointTaskOpts) ("github.com/containerd/containerd".Image, error) (typecheck)
  Error: : # github.com/containerd/containerd/v2/pkg/cri/server [github.com/containerd/containerd/v2/pkg/cri/server.test]
  Error: pkg/cri/server/image_pull.go:550:59: cannot use decUnpackOpt (variable of type "github.com/containerd/containerd".UnpackOpt) as "github.com/containerd/containerd/v2".UnpackOpt value in array or slice literal (typecheck)

@thaJeztah thaJeztah mentioned this pull request May 5, 2023
Merged
@thaJeztah thaJeztah mentioned this pull request Aug 2, 2023
Closed
@kzys
Copy link
Copy Markdown
Member

kzys commented Aug 12, 2023

Let me check Protobuild side of things. Starting from containerd/protobuild#61.

@mxpv mxpv added the status/needs-update Awaiting contributor update label Aug 25, 2023
@AkihiroSuda AkihiroSuda added this to the 2.0 milestone Aug 29, 2023
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 1, 2023

@thaJeztah thaJeztah closed this Nov 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

status/needs-update Awaiting contributor update

Projects

None yet

Milestone

2.0

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @k8s-ci-robot @kzys @mxpv @AkihiroSuda