Skip to content

Commit 6346b9d

Browse files
authored
Merge pull request kubernetes#125408 from benluddy/bump-cbor-v2.7.0
KEP-4222: Bump github.com/fxamacker/cbor/v2.
2 parents 6e8e1f5 + b24defa commit 6346b9d

File tree

74 files changed

+2440
-963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2440
-963
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ require (
146146
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
147147
github.com/fatih/camelcase v1.0.0 // indirect
148148
github.com/felixge/httpsnoop v1.0.3 // indirect
149-
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
149+
github.com/fxamacker/cbor/v2 v2.7.0-beta // indirect
150150
github.com/go-errors/errors v1.4.2 // indirect
151151
github.com/go-logr/stdr v1.2.2 // indirect
152152
github.com/go-logr/zapr v1.3.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09
294294
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
295295
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
296296
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
297-
github.com/fxamacker/cbor/v2 v2.6.0 h1:sU6J2usfADwWlYDAFhZBQ6TnLFBHxgesMrQfQgk1tWA=
298-
github.com/fxamacker/cbor/v2 v2.6.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
297+
github.com/fxamacker/cbor/v2 v2.7.0-beta h1:m5bO941uTVpSms26QjzEJxUZaC3S/h1pSJexBCu4wAA=
298+
github.com/fxamacker/cbor/v2 v2.7.0-beta/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
299299
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
300300
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
301301
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=

staging/src/k8s.io/api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212

1313
require (
1414
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
15-
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
15+
github.com/fxamacker/cbor/v2 v2.7.0-beta // indirect
1616
github.com/go-logr/logr v1.4.1 // indirect
1717
github.com/golang/protobuf v1.5.4 // indirect
1818
github.com/google/go-cmp v0.6.0 // indirect

staging/src/k8s.io/api/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/dustin/go-humanize v1.0.1 // indirect
5353
github.com/felixge/httpsnoop v1.0.3 // indirect
5454
github.com/fsnotify/fsnotify v1.7.0 // indirect
55-
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
55+
github.com/fxamacker/cbor/v2 v2.7.0-beta // indirect
5656
github.com/go-logr/logr v1.4.1 // indirect
5757
github.com/go-logr/stdr v1.2.2 // indirect
5858
github.com/go-openapi/jsonpointer v0.19.6 // indirect

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apimachinery/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.22.0
77
require (
88
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
99
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
10-
github.com/fxamacker/cbor/v2 v2.6.0
10+
github.com/fxamacker/cbor/v2 v2.7.0-beta
1111
github.com/gogo/protobuf v1.3.2
1212
github.com/golang/protobuf v1.5.4
1313
github.com/google/gnostic-models v0.6.8

staging/src/k8s.io/apimachinery/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes/decode.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ var Decode cbor.DecMode = func() cbor.DecMode {
8484
// When decoding an unrecognized tag to interface{}, return the decoded tag content
8585
// instead of the default, a cbor.Tag representing a (number, content) pair.
8686
UnrecognizedTagToAny: cbor.UnrecognizedTagContentToAny,
87+
88+
// For parity with JSON, strings can be decoded into time.Time if they are RFC 3339
89+
// timestamps.
90+
ByteStringToTime: cbor.ByteStringToTimeAllowed,
8791
}.DecMode()
8892
if err != nil {
8993
panic(err)

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ require (
6969
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7070
github.com/dustin/go-humanize v1.0.1 // indirect
7171
github.com/felixge/httpsnoop v1.0.3 // indirect
72-
github.com/fxamacker/cbor/v2 v2.6.0 // indirect
72+
github.com/fxamacker/cbor/v2 v2.7.0-beta // indirect
7373
github.com/go-logr/logr v1.4.1 // indirect
7474
github.com/go-logr/stdr v1.2.2 // indirect
7575
github.com/go-openapi/jsonpointer v0.19.6 // indirect

0 commit comments

Comments
 (0)