Skip to content

Commit 662468e

Browse files
committed
update generation script
1 parent d4db27a commit 662468e

7 files changed

+5
-37
lines changed

Makefile

-8
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,16 @@ verify: build
8383
hack/verify-govet.sh ||r=1;\
8484
hack/verify-imports.sh ||r=1;\
8585
hack/verify-generated-bindata.sh ||r=1;\
86-
hack/verify-generated-deep-copies.sh ||r=1;\
8786
hack/verify-generated-conversions.sh ||r=1;\
8887
hack/verify-generated-clientsets.sh ||r=1;\
8988
hack/verify-generated-defaulters.sh ||r=1;\
9089
hack/verify-generated-listers.sh ||r=1;\
9190
hack/verify-generated-informers.sh ||r=1;\
9291
hack/verify-generated-openapi.sh ||r=1;\
93-
hack/verify-generated-protobuf.sh ||r=1;\
9492
hack/verify-generated-completions.sh ||r=1;\
9593
hack/verify-generated-docs.sh ||r=1;\
9694
hack/verify-cli-conventions.sh ||r=1;\
9795
hack/verify-generated-json-codecs.sh ||r=1; \
98-
hack/verify-generated-swagger-descriptions.sh ||r=1;\
9996
hack/verify-generated-swagger-spec.sh ||r=1;\
10097
exit $$r ;\
10198
}
@@ -116,18 +113,15 @@ verify-commits:
116113
# make update
117114
update:
118115
hack/update-generated-bindata.sh
119-
hack/update-generated-deep-copies.sh
120116
hack/update-generated-conversions.sh
121117
hack/update-generated-clientsets.sh
122118
hack/update-generated-defaulters.sh
123119
hack/update-generated-listers.sh
124120
hack/update-generated-informers.sh
125121
hack/update-generated-openapi.sh
126-
hack/update-generated-protobuf.sh
127122
$(MAKE) build
128123
hack/update-generated-completions.sh
129124
hack/update-generated-docs.sh
130-
hack/update-generated-swagger-descriptions.sh
131125
hack/update-generated-swagger-spec.sh
132126
.PHONY: update
133127

@@ -136,11 +130,9 @@ update:
136130
# Example:
137131
# make update-api
138132
update-api:
139-
hack/update-generated-deep-copies.sh
140133
hack/update-generated-conversions.sh
141134
hack/update-generated-defaulters.sh
142135
hack/update-generated-swagger-descriptions.sh
143-
hack/update-generated-protobuf.sh
144136
hack/update-generated-openapi.sh
145137
$(MAKE) build
146138
hack/update-generated-swagger-spec.sh

hack/update-generated-clientsets.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if [[ -z "${verify}" ]]; then
4141
for pkg in "${packages[@]}"; do
4242
grouppkg=$(realpath --canonicalize-missing --relative-to=$(pwd) ${pkg}/../..)
4343
# delete all generated go files excluding files named *_expansion.go
44-
go list -f '{{.Dir}}' "${grouppkg}/generated/clientset" "${grouppkg}/generated/internalclientset" \
44+
go list -f '{{.Dir}}' "${grouppkg}/generated/internalclientset" \
4545
| xargs -n1 -I{} find {} -type f -not -name "*_expansion.go" -delete
4646
done
4747
fi
@@ -50,5 +50,4 @@ for pkg in "${packages[@]}"; do
5050
shortGroup=$(basename "${pkg}")
5151
containingPackage=$(dirname "${pkg}")
5252
generate_clientset_for "${containingPackage}" "internalclientset" --input=${shortGroup} ${verify} "$@"
53-
generate_clientset_for "${containingPackage}" "clientset" --input=${shortGroup}/v1 ${verify} "$@"
5453
done

hack/update-generated-deep-copies.sh

-8
This file was deleted.

hack/update-generated-informers.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ function generate_informers_for() {
2727
grouppkg=$(realpath --canonicalize-missing --relative-to=$(pwd) ${package}/../..)
2828
informer-gen --logtostderr \
2929
--go-header-file=hack/boilerplate.txt \
30-
--input-dirs="${package},${package}/v1" \
30+
--input-dirs="${package}" \
3131
--output-package="${grouppkg}/generated/informers" \
32-
--versioned-clientset-package "${grouppkg}/generated/clientset" \
3332
--internal-clientset-package "${grouppkg}/generated/internalclientset" \
3433
--listers-package "${grouppkg}/generated/listers" \
3534
"$@"

hack/update-generated-listers.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function generate_listers_for() {
2727
grouppkg=$(realpath --canonicalize-missing --relative-to=$(pwd) ${package}/../..)
2828
lister-gen --logtostderr \
2929
--go-header-file=hack/boilerplate.txt \
30-
--input-dirs="${package},${package}/v1" \
30+
--input-dirs="${package}" \
3131
--output-package="${grouppkg}/generated/listers" \
3232
"$@"
3333
}

hack/update-generated-openapi.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ INPUT_DIRS=(
2222

2323
# origin apis
2424
$(
25-
grep --color=never -rl '+k8s:openapi-gen=' pkg | \
25+
grep --color=never -rl '+k8s:openapi-gen=' vendor/github.com/openshift/api | \
2626
xargs -n1 dirname | \
27-
sed "s,^,${ORIGIN_PREFIX}," | \
27+
sed "s,^vendor/,," | \
2828
sort -u
2929
)
3030
)

hack/verify-generated-deep-copies.sh

-14
This file was deleted.

0 commit comments

Comments
 (0)