Skip to content

Commit b5e36fe

Browse files
Merge pull request #136826 from alvaroaleman/bumpv0.32
Bump structured merge diff to v6.3.2 Kubernetes-commit: 65f09e605cb206b2e5fcff4d69a4ae8acf62dbc3
2 parents 8202729 + 31c1b60 commit b5e36fe

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ godebug default=go1.25
88

99
require (
1010
golang.org/x/time v0.14.0
11-
k8s.io/api v0.0.0-20260206114330-2024a969c4aa
12-
k8s.io/apimachinery v0.0.0-20260205233455-f12546b4989d
13-
k8s.io/client-go v0.0.0-20260210000021-c6e2e47b317b
14-
k8s.io/code-generator v0.0.0-20260209200359-dcd4edcd2efc
11+
k8s.io/api v0.0.0-20260210200506-f5f249b4abf6
12+
k8s.io/apimachinery v0.0.0-20260210195147-ac0aa3101e5c
13+
k8s.io/client-go v0.0.0-20260210202119-8fcd3c218f43
14+
k8s.io/code-generator v0.0.0-20260210204710-e6283fe0aaba
1515
k8s.io/klog/v2 v2.130.1
1616
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4
1717
k8s.io/utils v0.0.0-20260108192941-914a6e750570
18-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1
18+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2
1919
)
2020

2121
require (

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
115115
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
116116
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
117117
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
118-
k8s.io/api v0.0.0-20260206114330-2024a969c4aa h1:GO1AsUUnHwpAj8oaLvDGB1/xf1VpuunDgXVVVYOoAbQ=
119-
k8s.io/api v0.0.0-20260206114330-2024a969c4aa/go.mod h1:SLyqIZiTKhK19Jubflyww0FSn/BngbX8eb/BE/2aU3w=
120-
k8s.io/apimachinery v0.0.0-20260205233455-f12546b4989d h1:bxuu4ynFTom/p7dq3+D7rcM500tuOXgMoEY7OqtmboE=
121-
k8s.io/apimachinery v0.0.0-20260205233455-f12546b4989d/go.mod h1:hQkG060WLAG1TIkYsu5lj3tb6YdNpKe5Zrr2UPGg+/k=
122-
k8s.io/client-go v0.0.0-20260210000021-c6e2e47b317b h1:+LzTCKfsKqh8uGgCZUV38q7/1HzmjKlHriL0lkJNZ5Y=
123-
k8s.io/client-go v0.0.0-20260210000021-c6e2e47b317b/go.mod h1:yl6M76uj6FvTxnHMVDvDVn5hp/L2t0ITqBynW8tMKCo=
124-
k8s.io/code-generator v0.0.0-20260209200359-dcd4edcd2efc h1:9ZQp5jMS5cLHf5ZS6IQO3kM/WTQck3OfYfjqTSyZMgo=
125-
k8s.io/code-generator v0.0.0-20260209200359-dcd4edcd2efc/go.mod h1:KP4dpswTGq3absCF0P5pjfVrV/FEwgyhgo4pPaBsrxI=
118+
k8s.io/api v0.0.0-20260210200506-f5f249b4abf6 h1:vrS1xkpCN3NEXqTSfNyG20R/YHZfofsyJ6CvQqh2JwA=
119+
k8s.io/api v0.0.0-20260210200506-f5f249b4abf6/go.mod h1:B0NIq8pBNVioUSHt/kOyu7VRGgymqYRM18NNuzch9pA=
120+
k8s.io/apimachinery v0.0.0-20260210195147-ac0aa3101e5c h1:IV922sFFodkSQRrni7sw7qoqNjDCY7bbHn/xW0tPc6k=
121+
k8s.io/apimachinery v0.0.0-20260210195147-ac0aa3101e5c/go.mod h1:MOYgM5v441TyeB214ckvgCU9rYGX/Mw6Z9ZXIp/F4sU=
122+
k8s.io/client-go v0.0.0-20260210202119-8fcd3c218f43 h1:UxKImWNaX2egRmvUMePqs6cRrKty65O0twPt3QuhRmg=
123+
k8s.io/client-go v0.0.0-20260210202119-8fcd3c218f43/go.mod h1:XHtcerQ6f1y0wX4sO56YEotGD2aPMPif6BvTPPq3FFM=
124+
k8s.io/code-generator v0.0.0-20260210204710-e6283fe0aaba h1:epBegFu4A2ZcikWMU4poGWPLnwOTC/JEpgXxGlRmR4s=
125+
k8s.io/code-generator v0.0.0-20260210204710-e6283fe0aaba/go.mod h1:Fdiz+gDk+6tPjJTPT/j95qPFdtDmpeFo81IzOlvwSfA=
126126
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
127127
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
128128
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -135,7 +135,7 @@ sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5E
135135
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
136136
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
137137
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
138-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 h1:JrhdFMqOd/+3ByqlP2I45kTOZmTRLBUm5pvRjeheg7E=
139-
sigs.k8s.io/structured-merge-diff/v6 v6.3.1/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
138+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 h1:kwVWMx5yS1CrnFWA/2QHyRVJ8jM6dBA80uLmm0wJkk8=
139+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
140140
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
141141
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

0 commit comments

Comments
 (0)