diff --git a/Makefile b/Makefile index fab48679c985..7edf7ccc1f90 100644 --- a/Makefile +++ b/Makefile @@ -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 ;\ } @@ -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 @@ -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 diff --git a/hack/update-generated-clientsets.sh b/hack/update-generated-clientsets.sh index 113eecc9f3f5..331a78925671 100755 --- a/hack/update-generated-clientsets.sh +++ b/hack/update-generated-clientsets.sh @@ -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 @@ -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 diff --git a/hack/update-generated-deep-copies.sh b/hack/update-generated-deep-copies.sh deleted file mode 100755 index c9e1937ad5ec..000000000000 --- a/hack/update-generated-deep-copies.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -source "$(dirname "${BASH_SOURCE}")/lib/init.sh" - -os::build::setup_env - -os::util::ensure::built_binary_exists 'gendeepcopy' - -gendeepcopy --output-base="${GOPATH}/src" "$@" \ No newline at end of file diff --git a/hack/update-generated-informers.sh b/hack/update-generated-informers.sh index 5e91f810ee8c..e93184186ed3 100755 --- a/hack/update-generated-informers.sh +++ b/hack/update-generated-informers.sh @@ -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" \ "$@" diff --git a/hack/update-generated-listers.sh b/hack/update-generated-listers.sh index a406c908a5ca..5fba4839d58c 100755 --- a/hack/update-generated-listers.sh +++ b/hack/update-generated-listers.sh @@ -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" \ "$@" } diff --git a/hack/update-generated-openapi.sh b/hack/update-generated-openapi.sh index ec06e650ca7b..c5105dffa98b 100755 --- a/hack/update-generated-openapi.sh +++ b/hack/update-generated-openapi.sh @@ -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 ) ) diff --git a/hack/verify-generated-deep-copies.sh b/hack/verify-generated-deep-copies.sh deleted file mode 100755 index efcd8853b8af..000000000000 --- a/hack/verify-generated-deep-copies.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -source "$(dirname "${BASH_SOURCE}")/lib/init.sh" - -function cleanup() { - return_code=$? - os::test::junit::generate_report - os::util::describe_return_code "${return_code}" - exit "${return_code}" -} -trap "cleanup" EXIT - -os::test::junit::declare_suite_start "verify/deep-copies" -os::cmd::expect_success "${OS_ROOT}/hack/update-generated-deep-copies.sh --verify-only" -os::test::junit::declare_suite_end \ No newline at end of file