Skip to content

Commit 0b5cea8

Browse files
authored
chore: move deprecated library location to new location (#9661)
* chore: move references to a deprecated package * chore: remove the now-unnecessary exclude * go get -u ./... && go mod tidy && go mod vendor
1 parent 0e322e0 commit 0b5cea8

File tree

25 files changed

+69
-1107
lines changed

25 files changed

+69
-1107
lines changed

go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ module github.com/GoogleContainerTools/skaffold/v2
22

33
go 1.23.4
44

5-
// Unit tests fail due to a breaking change in reference.Parse() from this version.
6-
exclude github.com/docker/distribution v2.8.3+incompatible
7-
85
// doesn't work well with windows
96
exclude github.com/karrick/godirwalk v1.17.0
107

@@ -29,7 +26,6 @@ require (
2926
github.com/containerd/containerd v1.7.25
3027
github.com/distribution/reference v0.6.0
3128
github.com/docker/cli v27.5.0+incompatible
32-
github.com/docker/distribution v2.8.2+incompatible
3329
github.com/docker/docker v27.5.0+incompatible
3430
github.com/docker/go-connections v0.5.0
3531
github.com/dustin/go-humanize v1.0.1
@@ -178,6 +174,7 @@ require (
178174
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
179175
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
180176
github.com/dimchansky/utfbom v1.1.1 // indirect
177+
github.com/docker/distribution v2.8.3+incompatible // indirect
181178
github.com/docker/docker-credential-helpers v0.8.2 // indirect
182179
github.com/docker/go-metrics v0.0.1 // indirect
183180
github.com/docker/go-units v0.5.0 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
209209
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
210210
github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM=
211211
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
212-
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
213-
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
212+
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
213+
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
214214
github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
215215
github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
216216
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=

pkg/skaffold/docker/default_repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"regexp"
2121
"strings"
2222

23-
"github.com/docker/distribution/reference"
23+
"github.com/distribution/reference"
2424
)
2525

2626
const maxLength = 255

pkg/skaffold/docker/reference.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"regexp"
2121
"strings"
2222

23-
"github.com/docker/distribution/reference"
23+
"github.com/distribution/reference"
2424
)
2525

2626
var (

pkg/skaffold/kubernetes/loader/load.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525
"time"
2626

27-
"github.com/docker/distribution/reference"
27+
"github.com/distribution/reference"
2828
"k8s.io/client-go/tools/clientcmd/api"
2929

3030
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/config"

vendor/github.com/docker/distribution/.golangci.yml

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/.mailmap

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/BUILDING.md

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/Dockerfile

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/Makefile

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/blobs.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/digestset/set.go

-247
This file was deleted.

0 commit comments

Comments
 (0)