Skip to content

Commit dd06922

Browse files
authored
Merge pull request moby#5654 from thaJeztah/downgrade_tagged_releases
downgrade go-difflib and go-spew to tagged releases
2 parents e8c26b8 + 60b4760 commit dd06922

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

go.mod

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ require (
140140
github.com/containerd/ttrpc v1.2.7 // indirect
141141
github.com/containernetworking/cni v1.2.3 // indirect
142142
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
143-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
143+
github.com/davecgh/go-spew v1.1.1 // indirect
144144
github.com/dimchansky/utfbom v1.1.1 // indirect
145145
github.com/docker/docker-credential-helpers v0.8.2 // indirect
146146
github.com/docker/go-metrics v0.0.1 // indirect
@@ -165,7 +165,7 @@ require (
165165
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
166166
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
167167
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
168-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
168+
github.com/pmezard/go-difflib v1.0.0 // indirect
169169
github.com/prometheus/client_model v0.6.1 // indirect
170170
github.com/prometheus/common v0.55.0 // indirect
171171
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -184,3 +184,20 @@ require (
184184
tags.cncf.io/container-device-interface v0.8.0 // indirect
185185
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
186186
)
187+
188+
exclude (
189+
// TODO(thaJeztah): remove once fuse-overlayfs-snapshotter, nydus-snapshotter, and stargz-snapshotter updated to containerd v2.0.2 and downgraded these dependencies.
190+
//
191+
// These dependencies were updated to "master" in some modules we depend on,
192+
// but have no code-changes since their last release. Unfortunately, this also
193+
// causes a ripple effect, forcing all users of the containerd module to also
194+
// update these dependencies to an unrelease / un-tagged version.
195+
//
196+
// Both these dependencies will unlikely do a new release in the near future,
197+
// so exclude these versions so that we can downgrade to the current release.
198+
//
199+
// For additional details, see this PR and links mentioned in that PR:
200+
// https://github.com/kubernetes-sigs/kustomize/pull/5830#issuecomment-2569960859
201+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
202+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
203+
)

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
132132
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
133133
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
134134
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
135+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
135136
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
136-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
137-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
138137
github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
139138
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
140139
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -326,9 +325,8 @@ github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=
326325
github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=
327326
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
328327
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
328+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
329329
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
330-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
331-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
332330
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
333331
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
334332
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ github.com/coreos/go-systemd/v22/daemon
466466
# github.com/cpuguy83/go-md2man/v2 v2.0.5
467467
## explicit; go 1.11
468468
github.com/cpuguy83/go-md2man/v2/md2man
469-
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
469+
# github.com/davecgh/go-spew v1.1.1
470470
## explicit
471471
github.com/davecgh/go-spew/spew
472472
# github.com/dimchansky/utfbom v1.1.1
@@ -728,7 +728,7 @@ github.com/planetscale/vtprotobuf/generator/pattern
728728
github.com/planetscale/vtprotobuf/protohelpers
729729
github.com/planetscale/vtprotobuf/types/known/timestamppb
730730
github.com/planetscale/vtprotobuf/vtproto
731-
# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
731+
# github.com/pmezard/go-difflib v1.0.0
732732
## explicit
733733
github.com/pmezard/go-difflib/difflib
734734
# github.com/prometheus/client_golang v1.20.5

0 commit comments

Comments
 (0)