Skip to content

Conversation

@jankaluza
Copy link
Member

The Renovate PR to support top-level vendor directory is merged and should be deployed in the production.

It should be safe to re-enable the vendoring now.

@jankaluza
Copy link
Member Author

This is an example of Renovate PR opened in my fork with this PR applied: jankaluza#2

@jankaluza
Copy link
Member Author

Second commit skips the codespell for the ./vendor.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

Need to update the Makefiles to rename tidy to vendor and do the go work vendor step in the Makefiles and I guess we want the go work sync as well added to the top level Makefile. And then update the go-tidy github action to run the make vendor instead

@github-actions github-actions bot added storage Related to "storage" package common Related to "common" package image Related to "image" package labels Oct 22, 2025
@jankaluza
Copy link
Member Author

@Luap99 , done in the third commit. I also renamed the tidy-in-container to vendor-in-container, but I did not find any place where this is executed - probably only manually?

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM, @mtrmac PTAL

Copy link
Contributor

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Thanks, makes sense overall.

(For the record, AFAICT we need the vendor step because Renovate only does go work sync if vendoring is enabled, per #291 (comment) .)

common/Makefile Outdated
.PHONY: vendor
vendor:
$(GO) mod tidy
$(GO) work vendor
Copy link
Contributor

Choose a reason for hiding this comment

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

Apples in all 3 modules: The net effect is that a top-level make vendor would run go work vendor three times. That seems unnecessary (and from a quick local check, repeated go work vendor is not faster than the first run, so this is a ~real cost, although measured in single seconds).

Maybe keep the tidy goals in the subprojects, and only turn the top-level tidy into vendor.

Copy link
Member Author

Choose a reason for hiding this comment

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

So, I've kept the tidy in projects' Makefiles. The top-level Makefile has the vendor target now.

The Renovate PR to support top-level vendor directory is merged and
should be deployed in the production.

It should be safe to re-enable the vendoring now.

Signed-off-by: Jan Kaluza <[email protected]>
We do not want to check the spelling in the code we do not own.

Signed-off-by: Jan Kaluza <[email protected]>
And also run the `go work sync` in the end of the main Makefile.

Signed-off-by: Jan Kaluza <[email protected]>
@jankaluza jankaluza force-pushed the vendor-2 branch 2 times, most recently from 83aaec1 to af0fbec Compare October 24, 2025 09:54
Signed-off-by: Jan Kaluza <[email protected]>
@jankaluza
Copy link
Member Author

I also had to disable the git-validation for the ./vendor directory, otherwise it failed for some trailing white-spaces in the files in the ./vendor directory which are out of our control. This is done in the last commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

common Related to "common" package image Related to "image" package storage Related to "storage" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants