Skip to content

Commit f9aa3ea

Browse files
thaJeztahsreeram-venkitesh
authored andcommitted
downgrade go-difflib and go-spew to tagged releases
These dependencies were updated to "master" in some modules we depend on, but have no code-changes since their last release. Unfortunately, this also causes a ripple effect, forcing all users of the containerd module to also update these dependencies to an unrelease / un-tagged version. Both these dependencies will unlikely do a new release in the near future, so exclude these versions so that we can downgrade to the current release. For additional details, see [this PR][1] and links mentioned in it. [1]: kubernetes-sigs/kustomize#5830 (comment) Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent f19a5ef commit f9aa3ea

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

go.mod

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/containernetworking/cni v1.2.3
3535
github.com/containernetworking/plugins v1.5.1
3636
github.com/coreos/go-systemd/v22 v22.5.0
37-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
37+
github.com/davecgh/go-spew v1.1.1
3838
github.com/distribution/reference v0.6.0
3939
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
4040
github.com/docker/go-metrics v0.0.1
@@ -121,7 +121,7 @@ require (
121121
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
122122
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
123123
github.com/pkg/errors v0.9.1 // indirect
124-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
124+
github.com/pmezard/go-difflib v1.0.0 // indirect
125125
github.com/prometheus/client_model v0.6.1 // indirect
126126
github.com/prometheus/common v0.55.0 // indirect
127127
github.com/prometheus/procfs v0.15.1 // indirect
@@ -154,4 +154,19 @@ require (
154154
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
155155
)
156156

157+
exclude (
158+
// These dependencies were updated to "master" in some modules we depend on,
159+
// but have no code-changes since their last release. Unfortunately, this also
160+
// causes a ripple effect, forcing all users of the containerd module to also
161+
// update these dependencies to an unrelease / un-tagged version.
162+
//
163+
// Both these dependencies will unlikely do a new release in the near future,
164+
// so exclude these versions so that we can downgrade to the current release.
165+
//
166+
// For additional details, see this PR and links mentioned in that PR:
167+
// https://github.com/kubernetes-sigs/kustomize/pull/5830#issuecomment-2569960859
168+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
169+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
170+
)
171+
157172
replace k8s.io/cri-api => ../kubernetes/staging/src/k8s.io/cri-api/

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -714,9 +714,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB
714714
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
715715
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
716716
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
717+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
717718
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
718-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
719-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
720719
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
721720
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
722721
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
@@ -1045,9 +1044,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
10451044
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
10461045
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
10471046
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
1047+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10481048
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1049-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
1050-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
10511049
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
10521050
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
10531051
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
@@ -243,7 +243,7 @@ github.com/coreos/go-systemd/v22/dbus
243243
# github.com/cpuguy83/go-md2man/v2 v2.0.5
244244
## explicit; go 1.11
245245
github.com/cpuguy83/go-md2man/v2/md2man
246-
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
246+
# github.com/davecgh/go-spew v1.1.1
247247
## explicit
248248
github.com/davecgh/go-spew/spew
249249
# github.com/distribution/reference v0.6.0
@@ -429,7 +429,7 @@ github.com/pelletier/go-toml/v2/unstable
429429
# github.com/pkg/errors v0.9.1
430430
## explicit
431431
github.com/pkg/errors
432-
# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
432+
# github.com/pmezard/go-difflib v1.0.0
433433
## explicit
434434
github.com/pmezard/go-difflib/difflib
435435
# github.com/prometheus/client_golang v1.20.5

0 commit comments

Comments
 (0)