Skip to content

Commit

Permalink
chore: move deprecated library location to new location (#9661)
Browse files Browse the repository at this point in the history
* chore: move references to a deprecated package

* chore: remove the now-unnecessary exclude

* go get -u ./... && go mod tidy && go mod vendor
  • Loading branch information
plumpy authored Jan 14, 2025
1 parent 0e322e0 commit 0b5cea8
Show file tree
Hide file tree
Showing 25 changed files with 69 additions and 1,107 deletions.
5 changes: 1 addition & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ module github.com/GoogleContainerTools/skaffold/v2

go 1.23.4

// Unit tests fail due to a breaking change in reference.Parse() from this version.
exclude github.com/docker/distribution v2.8.3+incompatible

// doesn't work well with windows
exclude github.com/karrick/godirwalk v1.17.0

Expand All @@ -29,7 +26,6 @@ require (
github.com/containerd/containerd v1.7.25
github.com/distribution/reference v0.6.0
github.com/docker/cli v27.5.0+incompatible
github.com/docker/distribution v2.8.2+incompatible
github.com/docker/docker v27.5.0+incompatible
github.com/docker/go-connections v0.5.0
github.com/dustin/go-humanize v1.0.1
Expand Down Expand Up @@ -178,6 +174,7 @@ require (
github.com/cyphar/filepath-securejoin v0.4.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM=
github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v27.5.0+incompatible h1:um++2NcQtGRTz5eEgO6aJimo6/JxrTXC941hd05JO6U=
github.com/docker/docker v27.5.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/docker/default_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"regexp"
"strings"

"github.com/docker/distribution/reference"
"github.com/distribution/reference"
)

const maxLength = 255
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/docker/reference.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"regexp"
"strings"

"github.com/docker/distribution/reference"
"github.com/distribution/reference"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/kubernetes/loader/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

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

"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/config"
Expand Down
10 changes: 8 additions & 2 deletions vendor/github.com/docker/distribution/.golangci.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/docker/distribution/.mailmap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/distribution/BUILDING.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/github.com/docker/distribution/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/distribution/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/docker/distribution/blobs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

247 changes: 0 additions & 247 deletions vendor/github.com/docker/distribution/digestset/set.go

This file was deleted.

Loading

0 comments on commit 0b5cea8

Please sign in to comment.