Skip to content

Commit

Permalink
code-generator 0.29.5 doesn't nuke files (#333)
Browse files Browse the repository at this point in the history 
This file removal bug was fixed by
kubernetes/kubernetes#123261
so the workaround can be removed.

Signed-off-by: Stephen Kitt <[email protected]>
  • Loading branch information
@skitt
skitt authored May 29, 2024
1 parent 9d94703 commit cf2d921
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 74 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
k8s.io/api v0.29.1
k8s.io/apimachinery v0.29.1
k8s.io/client-go v0.29.1
k8s.io/code-generator v0.29.1
k8s.io/code-generator v0.29.5
k8s.io/component-base v0.29.1
k8s.io/klog/v2 v2.110.1
sigs.k8s.io/controller-runtime v0.17.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc=
k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A=
k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks=
k8s.io/code-generator v0.29.1 h1:8ba8BdtSmAVHgAMpzThb/fuyQeTRtN7NtN7VjMcDLew=
k8s.io/code-generator v0.29.1/go.mod h1:FwFi3C9jCrmbPjekhaCYcYG1n07CYiW1+PAPCockaos=
k8s.io/code-generator v0.29.5 h1:WqSdBPVV1B3jsPnKtPS39U02zj6Q7+FsjhAj1EPBJec=
k8s.io/code-generator v0.29.5/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE=
k8s.io/component-base v0.29.1 h1:MUimqJPCRnnHsskTTjKD+IC1EHBbRCVyi37IoFBrkYw=
k8s.io/component-base v0.29.1/go.mod h1:fP9GFjxYrLERq1GcWWZAE3bqbNcDKDytn2srWuHTtKc=
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 h1:pWEwq4Asjm4vjW7vcsmijwBhOr1/shsbSYiWXmNGlks=
Expand Down
7 changes: 0 additions & 7 deletions hack/update-codegen.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ ${SED_CMD} -i 's,^exec \(.*/generate-internal-groups.sh\),bash \1,g' ${CODEGEN_P
# Because go mod sux, we have to fake the vendor for generator in order to be able to build it...
${SED_CMD} -i 's/GO111MODULE=on go install/#GO111MODULE=on go install/g' ${CODEGEN_PKG}/generate-internal-groups.sh

# For verification we need to ensure we don't remove files
# TODO: this should be properly resolved upstream so that we can get
# rid of the below if condition for verify scripts
if [ ! -z "$verify" ]; then
${SED_CMD} -i 's/xargs \-0 rm \-f/xargs -0 echo ""/g' ${CODEGEN_PKG}/generate-internal-groups.sh
fi

# ...but we have to put it back, or `verify` will puke.
trap "git checkout ${CODEGEN_PKG}" EXIT

Expand Down
148 changes: 85 additions & 63 deletions vendor/k8s.io/code-generator/generate-internal-groups.sh
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ k8s.io/client-go/util/homedir
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/retry
k8s.io/client-go/util/workqueue
# k8s.io/code-generator v0.29.1
# k8s.io/code-generator v0.29.5
## explicit; go 1.21
k8s.io/code-generator
k8s.io/code-generator/cmd/applyconfiguration-gen
Expand Down

0 comments on commit cf2d921

Please sign in to comment.