File tree Expand file tree Collapse file tree 5 files changed +11
-7
lines changed Expand file tree Collapse file tree 5 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -48,6 +48,8 @@ updates:
4848 - dependency-name : " github.com/prometheus/*"
4949 update-types : [ "version-update:semver-major", "version-update:semver-minor" ]
5050 - dependency-name : " sigs.k8s.io/cluster-api-provider-openstack"
51+ # We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
52+ - dependency-name : " sigs.k8s.io/structured-merge-diff"
5153 labels :
5254 - " area/dependency"
53- - " ok-to-test"
55+ - " ok-to-test"
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ require (
3232 sigs.k8s.io/cluster-api v1.8.4
3333 sigs.k8s.io/cluster-api/test v1.8.4
3434 sigs.k8s.io/controller-runtime v0.19.1
35- sigs.k8s.io/structured-merge-diff/v4 v4.4.2
35+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1
3636 sigs.k8s.io/yaml v1.4.0
3737)
3838
Original file line number Diff line number Diff line change @@ -425,6 +425,7 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
425425gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc =
426426gopkg.in/natefinch/lumberjack.v2 v2.2.1 /go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc =
427427gopkg.in/yaml.v2 v2.2.2 /go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI =
428+ gopkg.in/yaml.v2 v2.2.8 /go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI =
428429gopkg.in/yaml.v2 v2.3.0 /go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI =
429430gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY =
430431gopkg.in/yaml.v2 v2.4.0 /go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ =
@@ -469,7 +470,7 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
469470sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd /go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0 =
470471sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg =
471472sigs.k8s.io/kind v0.24.0 /go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw =
472- sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA =
473- sigs.k8s.io/structured-merge-diff/v4 v4.4.2 /go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4 =
473+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4 =
474+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 /go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08 =
474475sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E =
475476sigs.k8s.io/yaml v1.4.0 /go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY =
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ require (
2020 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
2121 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2222 sigs.k8s.io/controller-runtime v0.19.1
23- sigs.k8s.io/structured-merge-diff/v4 v4.4.2
23+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1
2424 sigs.k8s.io/yaml v1.4.0
2525)
2626
Original file line number Diff line number Diff line change @@ -227,6 +227,7 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
227227gopkg.in/evanphx/json-patch.v4 v4.12.0 /go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M =
228228gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc =
229229gopkg.in/inf.v0 v0.9.1 /go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw =
230+ gopkg.in/yaml.v2 v2.2.8 /go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI =
230231gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY =
231232gopkg.in/yaml.v2 v2.4.0 /go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ =
232233gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c /go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM =
@@ -260,7 +261,7 @@ sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn
260261sigs.k8s.io/controller-runtime v0.19.1 /go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4 =
261262sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo =
262263sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd /go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0 =
263- sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA =
264- sigs.k8s.io/structured-merge-diff/v4 v4.4.2 /go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4 =
264+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4 =
265+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 /go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08 =
265266sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E =
266267sigs.k8s.io/yaml v1.4.0 /go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY =
You can’t perform that action at this time.
0 commit comments