Skip to content

Commit

Permalink
update generation script
Browse files Browse the repository at this point in the history
  • Loading branch information
deads2k committed Nov 28, 2017
1 parent d4db27a commit 662468e
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 37 deletions.
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,16 @@ verify: build
hack/verify-govet.sh ||r=1;\
hack/verify-imports.sh ||r=1;\
hack/verify-generated-bindata.sh ||r=1;\
hack/verify-generated-deep-copies.sh ||r=1;\
hack/verify-generated-conversions.sh ||r=1;\
hack/verify-generated-clientsets.sh ||r=1;\
hack/verify-generated-defaulters.sh ||r=1;\
hack/verify-generated-listers.sh ||r=1;\
hack/verify-generated-informers.sh ||r=1;\
hack/verify-generated-openapi.sh ||r=1;\
hack/verify-generated-protobuf.sh ||r=1;\
hack/verify-generated-completions.sh ||r=1;\
hack/verify-generated-docs.sh ||r=1;\
hack/verify-cli-conventions.sh ||r=1;\
hack/verify-generated-json-codecs.sh ||r=1; \
hack/verify-generated-swagger-descriptions.sh ||r=1;\
hack/verify-generated-swagger-spec.sh ||r=1;\
exit $$r ;\
}
Expand All @@ -116,18 +113,15 @@ verify-commits:
# make update
update:
hack/update-generated-bindata.sh
hack/update-generated-deep-copies.sh
hack/update-generated-conversions.sh
hack/update-generated-clientsets.sh
hack/update-generated-defaulters.sh
hack/update-generated-listers.sh
hack/update-generated-informers.sh
hack/update-generated-openapi.sh
hack/update-generated-protobuf.sh
$(MAKE) build
hack/update-generated-completions.sh
hack/update-generated-docs.sh
hack/update-generated-swagger-descriptions.sh
hack/update-generated-swagger-spec.sh
.PHONY: update

Expand All @@ -136,11 +130,9 @@ update:
# Example:
# make update-api
update-api:
hack/update-generated-deep-copies.sh
hack/update-generated-conversions.sh
hack/update-generated-defaulters.sh
hack/update-generated-swagger-descriptions.sh
hack/update-generated-protobuf.sh
hack/update-generated-openapi.sh
$(MAKE) build
hack/update-generated-swagger-spec.sh
Expand Down
3 changes: 1 addition & 2 deletions hack/update-generated-clientsets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [[ -z "${verify}" ]]; then
for pkg in "${packages[@]}"; do
grouppkg=$(realpath --canonicalize-missing --relative-to=$(pwd) ${pkg}/../..)
# delete all generated go files excluding files named *_expansion.go
go list -f '{{.Dir}}' "${grouppkg}/generated/clientset" "${grouppkg}/generated/internalclientset" \
go list -f '{{.Dir}}' "${grouppkg}/generated/internalclientset" \
| xargs -n1 -I{} find {} -type f -not -name "*_expansion.go" -delete
done
fi
Expand All @@ -50,5 +50,4 @@ for pkg in "${packages[@]}"; do
shortGroup=$(basename "${pkg}")
containingPackage=$(dirname "${pkg}")
generate_clientset_for "${containingPackage}" "internalclientset" --input=${shortGroup} ${verify} "$@"
generate_clientset_for "${containingPackage}" "clientset" --input=${shortGroup}/v1 ${verify} "$@"
done
8 changes: 0 additions & 8 deletions hack/update-generated-deep-copies.sh

This file was deleted.

3 changes: 1 addition & 2 deletions hack/update-generated-informers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ function generate_informers_for() {
grouppkg=$(realpath --canonicalize-missing --relative-to=$(pwd) ${package}/../..)
informer-gen --logtostderr \
--go-header-file=hack/boilerplate.txt \
--input-dirs="${package},${package}/v1" \
--input-dirs="${package}" \
--output-package="${grouppkg}/generated/informers" \
--versioned-clientset-package "${grouppkg}/generated/clientset" \
--internal-clientset-package "${grouppkg}/generated/internalclientset" \
--listers-package "${grouppkg}/generated/listers" \
"$@"
Expand Down
2 changes: 1 addition & 1 deletion hack/update-generated-listers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function generate_listers_for() {
grouppkg=$(realpath --canonicalize-missing --relative-to=$(pwd) ${package}/../..)
lister-gen --logtostderr \
--go-header-file=hack/boilerplate.txt \
--input-dirs="${package},${package}/v1" \
--input-dirs="${package}" \
--output-package="${grouppkg}/generated/listers" \
"$@"
}
Expand Down
4 changes: 2 additions & 2 deletions hack/update-generated-openapi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ INPUT_DIRS=(

# origin apis
$(
grep --color=never -rl '+k8s:openapi-gen=' pkg | \
grep --color=never -rl '+k8s:openapi-gen=' vendor/github.com/openshift/api | \
xargs -n1 dirname | \
sed "s,^,${ORIGIN_PREFIX}," | \
sed "s,^vendor/,," | \
sort -u
)
)
Expand Down
14 changes: 0 additions & 14 deletions hack/verify-generated-deep-copies.sh

This file was deleted.

0 comments on commit 662468e

Please sign in to comment.