Skip to content

Commit 5369ed0

Browse files
committed
code-generator 0.29.5 doesn't nuke files
This file removal bug was fixed by kubernetes/kubernetes#123261 so the workaround can be removed. Signed-off-by: Stephen Kitt <[email protected]>
1 parent 9d94703 commit 5369ed0

File tree

5 files changed

+89
-74
lines changed

5 files changed

+89
-74
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
k8s.io/api v0.29.1
1414
k8s.io/apimachinery v0.29.1
1515
k8s.io/client-go v0.29.1
16-
k8s.io/code-generator v0.29.1
16+
k8s.io/code-generator v0.29.5
1717
k8s.io/component-base v0.29.1
1818
k8s.io/klog/v2 v2.110.1
1919
sigs.k8s.io/controller-runtime v0.17.2

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc=
232232
k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
233233
k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A=
234234
k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks=
235-
k8s.io/code-generator v0.29.1 h1:8ba8BdtSmAVHgAMpzThb/fuyQeTRtN7NtN7VjMcDLew=
236-
k8s.io/code-generator v0.29.1/go.mod h1:FwFi3C9jCrmbPjekhaCYcYG1n07CYiW1+PAPCockaos=
235+
k8s.io/code-generator v0.29.5 h1:WqSdBPVV1B3jsPnKtPS39U02zj6Q7+FsjhAj1EPBJec=
236+
k8s.io/code-generator v0.29.5/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE=
237237
k8s.io/component-base v0.29.1 h1:MUimqJPCRnnHsskTTjKD+IC1EHBbRCVyi37IoFBrkYw=
238238
k8s.io/component-base v0.29.1/go.mod h1:fP9GFjxYrLERq1GcWWZAE3bqbNcDKDytn2srWuHTtKc=
239239
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=

hack/update-codegen.sh

-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ ${SED_CMD} -i 's,^exec \(.*/generate-internal-groups.sh\),bash \1,g' ${CODEGEN_P
1414
# Because go mod sux, we have to fake the vendor for generator in order to be able to build it...
1515
${SED_CMD} -i 's/GO111MODULE=on go install/#GO111MODULE=on go install/g' ${CODEGEN_PKG}/generate-internal-groups.sh
1616

17-
# For verification we need to ensure we don't remove files
18-
# TODO: this should be properly resolved upstream so that we can get
19-
# rid of the below if condition for verify scripts
20-
if [ ! -z "$verify" ]; then
21-
${SED_CMD} -i 's/xargs \-0 rm \-f/xargs -0 echo ""/g' ${CODEGEN_PKG}/generate-internal-groups.sh
22-
fi
23-
2417
# ...but we have to put it back, or `verify` will puke.
2518
trap "git checkout ${CODEGEN_PKG}" EXIT
2619

vendor/k8s.io/code-generator/generate-internal-groups.sh

+85-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ k8s.io/client-go/util/homedir
576576
k8s.io/client-go/util/keyutil
577577
k8s.io/client-go/util/retry
578578
k8s.io/client-go/util/workqueue
579-
# k8s.io/code-generator v0.29.1
579+
# k8s.io/code-generator v0.29.5
580580
## explicit; go 1.21
581581
k8s.io/code-generator
582582
k8s.io/code-generator/cmd/applyconfiguration-gen

0 commit comments

Comments
 (0)