Skip to content

Commit 661c47d

Browse files
authored
Merge pull request #35 from DockToFuture/switch/code-generator
update k8s.io/code-generator and drop replacement
2 parents 7d01faf + 4140309 commit 661c47d

2 files changed

Lines changed: 10 additions & 16 deletions

File tree

internal/tools/go.mod

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,11 @@ require (
334334
honnef.co/go/tools v0.7.0 // indirect
335335
k8s.io/api v0.35.1 // indirect
336336
k8s.io/apiextensions-apiserver v0.35.1 // indirect
337-
k8s.io/apimachinery v0.36.0-beta.0 // indirect
337+
k8s.io/apimachinery v0.36.0-rc.1 // indirect
338338
k8s.io/apiserver v0.35.1 // indirect
339339
k8s.io/cli-runtime v0.35.1 // indirect
340340
k8s.io/client-go v0.35.1 // indirect
341-
k8s.io/code-generator v0.35.1 // indirect
341+
k8s.io/code-generator v0.36.0-rc.1 // indirect
342342
k8s.io/component-base v0.35.1 // indirect
343343
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
344344
k8s.io/klog/v2 v2.140.0 // indirect
@@ -360,9 +360,3 @@ require (
360360
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
361361
sigs.k8s.io/yaml v1.6.0 // indirect
362362
)
363-
364-
// TODO: get rid of this one once we are done with the upstream issue
365-
// TODO: a fix until the following upstream issue is clarified.
366-
//
367-
// https://github.com/kubernetes/kubernetes/issues/135417
368-
replace k8s.io/code-generator => github.com/dnaeon/code-generator v0.34.2-fixed-defaulter-gen

internal/tools/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
185185
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
186186
github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
187187
github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
188-
github.com/dnaeon/code-generator v0.34.2-fixed-defaulter-gen h1:1emfFebTOOglv6XMxtWEBB4CzDzy8n3QJxrdIk3ukG8=
189-
github.com/dnaeon/code-generator v0.34.2-fixed-defaulter-gen/go.mod h1:oOuD4QZQ/4OhuWuA/BFKvAgmO7YYKwKvfWAW693Nhn0=
190188
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
191189
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
192190
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8=
@@ -555,8 +553,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
555553
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
556554
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
557555
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
558-
github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
559-
github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
556+
github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y=
557+
github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
560558
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
561559
github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
562560
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -1035,8 +1033,8 @@ k8s.io/api v0.35.1 h1:0PO/1FhlK/EQNVK5+txc4FuhQibV25VLSdLMmGpDE/Q=
10351033
k8s.io/api v0.35.1/go.mod h1:28uR9xlXWml9eT0uaGo6y71xK86JBELShLy4wR1XtxM=
10361034
k8s.io/apiextensions-apiserver v0.35.1 h1:p5vvALkknlOcAqARwjS20kJffgzHqwyQRM8vHLwgU7w=
10371035
k8s.io/apiextensions-apiserver v0.35.1/go.mod h1:2CN4fe1GZ3HMe4wBr25qXyJnJyZaquy4nNlNmb3R7AQ=
1038-
k8s.io/apimachinery v0.36.0-beta.0 h1:FioYxKfnvZuo0EUX/W9X0FhH3omaG7dEdtDk2IsfEtU=
1039-
k8s.io/apimachinery v0.36.0-beta.0/go.mod h1:AEUkaeqhot34WXPkRiWxszI4nUd8m40AAYi28N33hqc=
1036+
k8s.io/apimachinery v0.36.0-rc.1 h1:GUn8AMC/iXu64a2wauTV2pPwfkg96ozmhpV7zachuTU=
1037+
k8s.io/apimachinery v0.36.0-rc.1/go.mod h1:fx0hoLoUO0gmSXPkZA4iPtk/dTM2TGbu7OIv8TU6258=
10401038
k8s.io/apiserver v0.35.1 h1:potxdhhTL4i6AYAa2QCwtlhtB1eCdWQFvJV6fXgJzxs=
10411039
k8s.io/apiserver v0.35.1/go.mod h1:BiL6Dd3A2I/0lBnteXfWmCFobHM39vt5+hJQd7Lbpi4=
10421040
k8s.io/autoscaler/vertical-pod-autoscaler v1.5.1 h1:LlVtM3IKqIVHz1ZXC3ahe/mAtDWb7Eob0tyTzqFULqg=
@@ -1045,6 +1043,8 @@ k8s.io/cli-runtime v0.35.1 h1:uKcXFe8J7AMAM4Gm2JDK4mp198dBEq2nyeYtO+JfGJE=
10451043
k8s.io/cli-runtime v0.35.1/go.mod h1:55/hiXIq1C8qIJ3WBrWxEwDLdHQYhBNRdZOz9f7yvTw=
10461044
k8s.io/client-go v0.35.1 h1:+eSfZHwuo/I19PaSxqumjqZ9l5XiTEKbIaJ+j1wLcLM=
10471045
k8s.io/client-go v0.35.1/go.mod h1:1p1KxDt3a0ruRfc/pG4qT/3oHmUj1AhSHEcxNSGg+OA=
1046+
k8s.io/code-generator v0.36.0-rc.1 h1:f6WJ6pArf09DkS37HcETZxmqo1IhbrzcY3g9/8673Gw=
1047+
k8s.io/code-generator v0.36.0-rc.1/go.mod h1:+IhH2vEqgHYmoGLxTCBEpHZt9ou6ohe8vixeKaHW1tQ=
10481048
k8s.io/component-base v0.35.1 h1:XgvpRf4srp037QWfGBLFsYMUQJkE5yMa94UsJU7pmcE=
10491049
k8s.io/component-base v0.35.1/go.mod h1:HI/6jXlwkiOL5zL9bqA3en1Ygv60F03oEpnuU1G56Bs=
10501050
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
@@ -1061,8 +1061,8 @@ k8s.io/kubelet v0.34.3 h1:8QRev2FmasZ05yCC774qn6ULche72PYM7AQv0CVt9CM=
10611061
k8s.io/kubelet v0.34.3/go.mod h1:pMgblr+nVQ02UkyaTcgqzS3AIYVQkjlMFg1Pd5rGC1Q=
10621062
k8s.io/metrics v0.35.1 h1:MUcrUcWlq81XiripkydzCGsY9zQawDXfP9IICNNcVVw=
10631063
k8s.io/metrics v0.35.1/go.mod h1:9x7xWOAOiWzHA0vaqLgSE4PXF3vyT5ts5XIbx8OSjiI=
1064-
k8s.io/streaming v0.36.0-beta.0 h1:F3nft77sAwteE5VgwkJQQQsdRqkPCBKk4O24W5bkvtk=
1065-
k8s.io/streaming v0.36.0-beta.0/go.mod h1:5Zm1U2Duu3uu1nG/ijKuwNWDkQk24aXVpScAhzRkzkk=
1064+
k8s.io/streaming v0.36.0-rc.1 h1:LPZoHF+q0Aesf1MLNGJCEu4gzmZEJcJWRHNAMA6kgqo=
1065+
k8s.io/streaming v0.36.0-rc.1/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
10661066
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
10671067
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
10681068
mvdan.cc/gofumpt v0.9.2 h1:zsEMWL8SVKGHNztrx6uZrXdp7AX8r421Vvp23sz7ik4=

0 commit comments

Comments
 (0)