Skip to content

Commit 3ec3773

Browse files
Merge pull request #136826 from alvaroaleman/bumpv0.32
Bump structured merge diff to v6.3.2 Kubernetes-commit: 65f09e605cb206b2e5fcff4d69a4ae8acf62dbc3
2 parents b396ad3 + e08f42a commit 3ec3773

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ require (
3030
golang.org/x/sys v0.40.0
3131
golang.org/x/text v0.33.0
3232
gopkg.in/evanphx/json-patch.v4 v4.13.0
33-
k8s.io/api v0.0.0-20260206114330-2024a969c4aa
34-
k8s.io/apimachinery v0.0.0-20260205233455-f12546b4989d
35-
k8s.io/cli-runtime v0.0.0-20260205121859-5707c2f7916e
36-
k8s.io/client-go v0.0.0-20260210000021-c6e2e47b317b
37-
k8s.io/component-base v0.0.0-20260210040513-1d9c480db265
38-
k8s.io/component-helpers v0.0.0-20260205115455-c8ad3f9cfbe2
33+
k8s.io/api v0.0.0-20260210200506-f5f249b4abf6
34+
k8s.io/apimachinery v0.0.0-20260210195147-ac0aa3101e5c
35+
k8s.io/cli-runtime v0.0.0-20260210223705-4799ddc9bd7f
36+
k8s.io/client-go v0.0.0-20260210202119-8fcd3c218f43
37+
k8s.io/component-base v0.0.0-20260210205601-7ce8a3ac6d79
38+
k8s.io/component-helpers v0.0.0-20260210210429-7a53e6cccc15
3939
k8s.io/klog/v2 v2.130.1
4040
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4
41-
k8s.io/metrics v0.0.0-20260210003958-c1fc73da0c84
41+
k8s.io/metrics v0.0.0-20260210222953-cfc7eafd3e3d
4242
k8s.io/utils v0.0.0-20260108192941-914a6e750570
4343
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
4444
sigs.k8s.io/kustomize/kustomize/v5 v5.7.1
4545
sigs.k8s.io/kustomize/kyaml v0.20.1
4646
sigs.k8s.io/randfill v1.0.0
47-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1
47+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2
4848
sigs.k8s.io/yaml v1.6.0
4949
)
5050

@@ -92,5 +92,3 @@ require (
9292
gopkg.in/yaml.v3 v3.0.1 // indirect
9393
sigs.k8s.io/kustomize/api v0.20.1 // indirect
9494
)
95-
96-
replace k8s.io/code-generator => k8s.io/code-generator v0.0.0-20260210040254-668c74fd9a50

go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -192,24 +192,24 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
192192
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
193193
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
194194
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
195-
k8s.io/api v0.0.0-20260206114330-2024a969c4aa h1:GO1AsUUnHwpAj8oaLvDGB1/xf1VpuunDgXVVVYOoAbQ=
196-
k8s.io/api v0.0.0-20260206114330-2024a969c4aa/go.mod h1:SLyqIZiTKhK19Jubflyww0FSn/BngbX8eb/BE/2aU3w=
197-
k8s.io/apimachinery v0.0.0-20260205233455-f12546b4989d h1:bxuu4ynFTom/p7dq3+D7rcM500tuOXgMoEY7OqtmboE=
198-
k8s.io/apimachinery v0.0.0-20260205233455-f12546b4989d/go.mod h1:hQkG060WLAG1TIkYsu5lj3tb6YdNpKe5Zrr2UPGg+/k=
199-
k8s.io/cli-runtime v0.0.0-20260205121859-5707c2f7916e h1:iljQQktMFBlwAO64fRE5AsEKGvD4QhIDmNaEjXb2jHI=
200-
k8s.io/cli-runtime v0.0.0-20260205121859-5707c2f7916e/go.mod h1:UN/8uilcsNYs9F2BN0jusGVZ22qYH4nFCArFt2Cu3d0=
201-
k8s.io/client-go v0.0.0-20260210000021-c6e2e47b317b h1:+LzTCKfsKqh8uGgCZUV38q7/1HzmjKlHriL0lkJNZ5Y=
202-
k8s.io/client-go v0.0.0-20260210000021-c6e2e47b317b/go.mod h1:yl6M76uj6FvTxnHMVDvDVn5hp/L2t0ITqBynW8tMKCo=
203-
k8s.io/component-base v0.0.0-20260210040513-1d9c480db265 h1:iJVh05j7aTCvph1IEe1LiQAlWJI5oHZEX055O7HHbpI=
204-
k8s.io/component-base v0.0.0-20260210040513-1d9c480db265/go.mod h1:Moxq8zQ0h5o/GYgdKKqir1X4KYc1QAClDtgTADrNEO4=
205-
k8s.io/component-helpers v0.0.0-20260205115455-c8ad3f9cfbe2 h1:3Z4E2jxVVe4fT9Qp+wHi1tkAbWbBGCsmomxdhzjYrCs=
206-
k8s.io/component-helpers v0.0.0-20260205115455-c8ad3f9cfbe2/go.mod h1:X18EdwYA5rCJwBbBAv1DOPftD9Q3outrhzZqpz831OY=
195+
k8s.io/api v0.0.0-20260210200506-f5f249b4abf6 h1:vrS1xkpCN3NEXqTSfNyG20R/YHZfofsyJ6CvQqh2JwA=
196+
k8s.io/api v0.0.0-20260210200506-f5f249b4abf6/go.mod h1:B0NIq8pBNVioUSHt/kOyu7VRGgymqYRM18NNuzch9pA=
197+
k8s.io/apimachinery v0.0.0-20260210195147-ac0aa3101e5c h1:IV922sFFodkSQRrni7sw7qoqNjDCY7bbHn/xW0tPc6k=
198+
k8s.io/apimachinery v0.0.0-20260210195147-ac0aa3101e5c/go.mod h1:MOYgM5v441TyeB214ckvgCU9rYGX/Mw6Z9ZXIp/F4sU=
199+
k8s.io/cli-runtime v0.0.0-20260210223705-4799ddc9bd7f h1:dCG4cjT5DbPZBd6zfgRi5/6BKme0073D3+0V2rqFQP8=
200+
k8s.io/cli-runtime v0.0.0-20260210223705-4799ddc9bd7f/go.mod h1:U2XHAuCrmV8PzT+OlBmxPiy9z5K9pTt5wZsNScXB52U=
201+
k8s.io/client-go v0.0.0-20260210202119-8fcd3c218f43 h1:UxKImWNaX2egRmvUMePqs6cRrKty65O0twPt3QuhRmg=
202+
k8s.io/client-go v0.0.0-20260210202119-8fcd3c218f43/go.mod h1:XHtcerQ6f1y0wX4sO56YEotGD2aPMPif6BvTPPq3FFM=
203+
k8s.io/component-base v0.0.0-20260210205601-7ce8a3ac6d79 h1:DIUkpmzI2UU6AR0JH5BUxPcIq2NCp0eyOzRzgEZxNq8=
204+
k8s.io/component-base v0.0.0-20260210205601-7ce8a3ac6d79/go.mod h1:mfXM/wFVnjKS2kSiCbkV6hIVwnpG0x8FPnGsI5r2mpc=
205+
k8s.io/component-helpers v0.0.0-20260210210429-7a53e6cccc15 h1:pRH9bX0fyazCZBoQOrq2BVRZt3C9dUFscJ+CCLRwflQ=
206+
k8s.io/component-helpers v0.0.0-20260210210429-7a53e6cccc15/go.mod h1:axcjY6NGNDt4PVb2QjxFD5Rgkiue1TQ+yPjlX5Mf+RY=
207207
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
208208
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
209209
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=
210210
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
211-
k8s.io/metrics v0.0.0-20260210003958-c1fc73da0c84 h1:Ervtq4qQnyoJ863Cd02XyEe4qEnzFLKgqDxGpe1PcIc=
212-
k8s.io/metrics v0.0.0-20260210003958-c1fc73da0c84/go.mod h1:r/eb0xKdMSAhEvHVI0oHe6bi4D+k5mDVY1nhQfUrTqE=
211+
k8s.io/metrics v0.0.0-20260210222953-cfc7eafd3e3d h1:W5ud8GcUFjmxuMoyl8WmAHi3UMbpKwKT4KQeUsunoPA=
212+
k8s.io/metrics v0.0.0-20260210222953-cfc7eafd3e3d/go.mod h1:hjsTbG/yLmpgqiq7JjJILLrNVBuXWyx7PeCB3eQgaqg=
213213
k8s.io/utils v0.0.0-20260108192941-914a6e750570 h1:JT4W8lsdrGENg9W+YwwdLJxklIuKWdRm+BC+xt33FOY=
214214
k8s.io/utils v0.0.0-20260108192941-914a6e750570/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
215215
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
@@ -222,7 +222,7 @@ sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A
222222
sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
223223
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
224224
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
225-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 h1:JrhdFMqOd/+3ByqlP2I45kTOZmTRLBUm5pvRjeheg7E=
226-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
225+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8=
226+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
227227
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
228228
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

0 commit comments

Comments
 (0)