Skip to content

Commit 391a291

Browse files
authored
Merge pull request #2055 from kubernetes-sigs/dependabot/go_modules/k8s-dependencies-8b5b6cfa71
Bump sigs.k8s.io/structured-merge-diff/v4 from 4.6.0 to 4.7.0 in the k8s-dependencies group
2 parents 2858b94 + b370893 commit 391a291

File tree

6 files changed

+76
-13
lines changed

6 files changed

+76
-13
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ require (
115115
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
116116
k8s.io/test-infra v0.0.0-20210730160938-8ad9b8c53bd8 // indirect
117117
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
118-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
118+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
119119
sigs.k8s.io/yaml v1.4.0 // indirect
120120
)
121121

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,8 +2673,8 @@ sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnM
26732673
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
26742674
sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
26752675
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
2676-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
2677-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
2676+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
2677+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
26782678
sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
26792679
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
26802680
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ sigs.k8s.io/boskos/storage
960960
## explicit; go 1.21
961961
sigs.k8s.io/json
962962
sigs.k8s.io/json/internal/golang/encoding/json
963-
# sigs.k8s.io/structured-merge-diff/v4 v4.6.0
963+
# sigs.k8s.io/structured-merge-diff/v4 v4.7.0
964964
## explicit; go 1.13
965965
sigs.k8s.io/structured-merge-diff/v4/fieldpath
966966
sigs.k8s.io/structured-merge-diff/v4/merge

vendor/sigs.k8s.io/structured-merge-diff/v4/typed/validate.go

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

vendor/sigs.k8s.io/structured-merge-diff/v4/value/jsontagutil.go

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

vendor/sigs.k8s.io/structured-merge-diff/v4/value/reflectcache.go

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

0 commit comments

Comments
 (0)