Skip to content

Commit e728896

Browse files
fix(major deps): update module sigs.k8s.io/structured-merge-diff/v4 to v6 (#275)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent 46a61e1 commit e728896

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
sigs.k8s.io/controller-runtime v0.20.4
2828
sigs.k8s.io/kustomize/api v0.19.0
2929
sigs.k8s.io/kustomize/kyaml v0.19.0
30-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
30+
sigs.k8s.io/structured-merge-diff/v6 v6.0.0
3131
sigs.k8s.io/yaml v1.4.0
3232
)
3333

@@ -98,4 +98,5 @@ require (
9898
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
9999
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
100100
sigs.k8s.io/randfill v1.0.0 // indirect
101+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
101102
)

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,9 @@ sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/r
259259
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
260260
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
261261
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
262-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
263-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
262+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
263+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
264+
sigs.k8s.io/structured-merge-diff/v6 v6.0.0 h1:KNyvHZ4ODhitmwNvjprMRBdppZHoDJQF3xlcELX8Qd4=
265+
sigs.k8s.io/structured-merge-diff/v6 v6.0.0/go.mod h1:GbAVeWiRqSnOZ+kOAZWugRTPF3M9ySS4W3tL++kxz3w=
264266
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
265267
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

pkg/reconciler/ssa.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/sap/go-generics/slices"
1515

1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
17-
"sigs.k8s.io/structured-merge-diff/v4/fieldpath"
17+
"sigs.k8s.io/structured-merge-diff/v6/fieldpath"
1818
)
1919

2020
// TODO: needs refactoring

0 commit comments

Comments
 (0)