Skip to content

Commit ce560bb

Browse files
estespestesp
authored
Merge pull request #11222 from k8s-infra-cherrypick-robot/cherry-pick-11220-to-release/2.0
[release/2.0] downgrade go-difflib and go-spew to tagged releases
2 parents 0d91d8e + f341477 commit ce560bb

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

‎go.mod

+17-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/containernetworking/cni v1.2.3
3333
github.com/containernetworking/plugins v1.5.1
3434
github.com/coreos/go-systemd/v22 v22.5.0
35-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
35+
github.com/davecgh/go-spew v1.1.1
3636
github.com/distribution/reference v0.6.0
3737
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
3838
github.com/docker/go-metrics v0.0.1
@@ -119,7 +119,7 @@ require (
119119
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
120120
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
121121
github.com/pkg/errors v0.9.1 // indirect
122-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
122+
github.com/pmezard/go-difflib v1.0.0 // indirect
123123
github.com/prometheus/client_model v0.6.1 // indirect
124124
github.com/prometheus/common v0.55.0 // indirect
125125
github.com/prometheus/procfs v0.15.1 // indirect
@@ -151,3 +151,18 @@ require (
151151
sigs.k8s.io/yaml v1.4.0 // indirect
152152
tags.cncf.io/container-device-interface/specs-go v0.8.0 // indirect
153153
)
154+
155+
exclude (
156+
// These dependencies were updated to "master" in some modules we depend on,
157+
// but have no code-changes since their last release. Unfortunately, this also
158+
// causes a ripple effect, forcing all users of the containerd module to also
159+
// update these dependencies to an unrelease / un-tagged version.
160+
//
161+
// Both these dependencies will unlikely do a new release in the near future,
162+
// so exclude these versions so that we can downgrade to the current release.
163+
//
164+
// For additional details, see this PR and links mentioned in that PR:
165+
// https://github.com/kubernetes-sigs/kustomize/pull/5830#issuecomment-2569960859
166+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
167+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
168+
)

‎go.sum

+2-4
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=
@@ -1038,9 +1037,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
10381037
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
10391038
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
10401039
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
1040+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
10411041
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1042-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
1043-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
10441042
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
10451043
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
10461044
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

‎vendor/modules.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ github.com/coreos/go-systemd/v22/dbus
241241
# github.com/cpuguy83/go-md2man/v2 v2.0.5
242242
## explicit; go 1.11
243243
github.com/cpuguy83/go-md2man/v2/md2man
244-
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
244+
# github.com/davecgh/go-spew v1.1.1
245245
## explicit
246246
github.com/davecgh/go-spew/spew
247247
# github.com/distribution/reference v0.6.0
@@ -426,7 +426,7 @@ github.com/pelletier/go-toml/v2/unstable
426426
# github.com/pkg/errors v0.9.1
427427
## explicit
428428
github.com/pkg/errors
429-
# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
429+
# github.com/pmezard/go-difflib v1.0.0
430430
## explicit
431431
github.com/pmezard/go-difflib/difflib
432432
# github.com/prometheus/client_golang v1.20.5

0 commit comments

Comments
 (0)