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

chore: move deprecated library location to new location #9661

Merged
merged 3 commits into from
Jan 14, 2025

Conversation

plumpy
Copy link
Collaborator

@plumpy plumpy commented Jan 14, 2025

github.com/docker/distribution/reference was deprecated
github.com/distribution/reference is the new location

Update the imports in the Skaffold codebase, which then removes it as a direct dependency, which means we no longer need the version exclude.

Copy link

@code-review-assist code-review-assist bot left a comment

Choose a reason for hiding this comment

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

Hi @plumpy, reviewers, and future readers!

I'm Gemini, and I'm currently reviewing this pull request. In the meantime, here's a quick summary to get everyone up to speed:

This PR addresses the deprecation of github.com/docker/distribution/reference by moving to the new location github.com/distribution/reference. The main intent is to update the Skaffold codebase to use the non-deprecated library and remove the version exclude in go.mod that was previously necessary.

Here's a breakdown of the changes:

  • go.mod: The exclude github.com/docker/distribution v2.8.3+incompatible line has been removed (lines 5-6 removed, line 7 moved up). Additionally, the direct dependency github.com/docker/distribution v2.8.2+incompatible was removed (line 32 removed), and an indirect dependency github.com/docker/distribution v2.8.3+incompatible was added (line 177). The go.sum file was updated accordingly (lines 212-213 changed).

  • Multiple Go files: The import path for github.com/docker/distribution/reference was updated to github.com/distribution/reference in several files:

    • pkg/skaffold/docker/default_repo.go (line 23)
    • pkg/skaffold/docker/reference.go (line 23)
    • pkg/skaffold/kubernetes/loader/load.go (line 27)
    • vendor/github.com/docker/distribution/blobs.go (line 11)
  • Vendor directory changes: Several files within the vendor/github.com/docker/distribution directory were modified. These changes appear to be related to build configurations, build tags, and maintainers. Specific changes include updates to .golangci.yml (lines 3-5, 12-21), .mailmap (lines 52-54), BUILDING.md (line 117), Dockerfile (lines 3, 4, 25, 30), Makefile (line 53), and removal of digestset and reference directories.

  • vendor/modules.txt: The entry for github.com/docker/distribution was updated to reflect the new version (line 487).

I'll have a more detailed review shortly. In the meantime, please let me know if you have any questions.

And now, a little haiku to brighten your day:

Old paths fade to gray,
New imports shine, bright and clear,
Code flows, clean and swift.

Copy link

@code-review-assist code-review-assist bot left a comment

Choose a reason for hiding this comment

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

This PR updates the import path for the reference library from the deprecated github.com/docker/distribution/reference to the new location github.com/distribution/reference. This is a necessary change to keep Skaffold up-to-date with the library. The PR also correctly removes the version exclude for the old dependency in go.mod and go.sum.

Overall, the changes are straightforward and correct. One minor suggestion for improvement below.

@plumpy plumpy marked this pull request as ready for review January 14, 2025 20:28
@plumpy plumpy requested a review from a team as a code owner January 14, 2025 20:28
@plumpy plumpy requested a review from Darien-Lin January 14, 2025 20:28
@plumpy plumpy merged commit 0b5cea8 into GoogleContainerTools:main Jan 14, 2025
14 checks passed
@plumpy plumpy deleted the fix_distribution_reference branch January 14, 2025 20:41
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.

2 participants