Skip to content

[release/1.7] Update api version to v1.7.19#10387

Merged
estesp merged 1 commit intocontainerd:release/1.7from
dmcgowan:1.7-update-api
Jun 26, 2024
Merged

[release/1.7] Update api version to v1.7.19#10387
estesp merged 1 commit intocontainerd:release/1.7from
dmcgowan:1.7-update-api

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Update with latest tagged version to prepare for v1.7.19 release in the main module

@thaJeztah
Copy link
Copy Markdown
Member

You need to make vendor;

 These files were modified:
  
  ?? vendor/github.com/containerd/containerd/api/LICENSE

Because vendor/github.com/containerd/containerd/api is no longer the package but vendored from the module, and the module automatically gets the LICENSE from the repository added (even if it's not in the directory itself).

make vendor

git status
On branch 1.7-update-api
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   integration/client/go.mod

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	vendor/github.com/containerd/containerd/api/LICENSE

no changes added to commit (use "git add" and/or "git commit -a")

I guess we could consider to copy the LICENSE to the api/ module, so that they're more identical to what users get if they download the module.

Comment thread go.mod
Comment on lines -154 to -155

replace github.com/containerd/containerd/api => ./api
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Note that this means that the code in the api directory will no longer be tested. Currently that's fine, because the code in that directory is what's tagged as api/v1.7.19, but if changes are made after this, they will be untested (and the code is all dead-code).

If we don't plan to do maintenance on api v1.7.x, then we should consider deleting the directory.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This line is added by make protos and removed by clean-vendor. Also the api module has no tests anyway, any changes to the API in 1.7 are likely to be accompanied by a change in the main module which relies on them for building/testing. Its premature to remove the directory, we can discuss alternative options if and when it becomes a maintenance burden.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Also the api module has no tests anyway,

Yeah, I was thinking "to test the API used in the containerd codebase", so I wondered if the replace rule should either be always there, or if we should have a test in CI that tests both against the actual current release of the API module, as well as the version in the branch (which would be considered API v1.7.<next> if changes were made)

Signed-off-by: Derek McGowan <[email protected]>
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

@estesp estesp merged commit 0794797 into containerd:release/1.7 Jun 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants