github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 21:12:07 +00:00
Code Issues Projects Releases Wiki Activity

kube_codegen: avoid dups in dirs with >1 file

Browse Source 
This happens in out-of-tree consumers of this script.
This commit is contained in:
Tim Hockin 2023-10-20 16:28:25 -07:00
parent 88d9573c30
commit a789a9d44b
No known key found for this signature in database
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
staging/src/k8s.io/code-generator/kube_codegen.sh
View File

@ -118,16 +118,16 @@ function kube::codegen::gen_helpers() {
# Deepcopy # Deepcopy
# #
local input_pkgs=() local input_pkgs=()
while read -r file; do while read -r dir; do
dir="$(dirname "${file}")"
pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)" pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)"
input_pkgs+=("${pkg}") input_pkgs+=("${pkg}")
done < <( done < <(
( kube::codegen::internal::git_grep -l \ ( kube::codegen::internal::git_grep -l --null \
-e '+k8s:deepcopy-gen=' \ -e '+k8s:deepcopy-gen=' \
":(glob)${root}"/'**/*.go' \ ":(glob)${root}"/'**/*.go' \
|| true \ || true \
) | LC_ALL=C sort -u ) | xargs -0 -n1 dirname \
| LC_ALL=C sort -u
) )
if [ "${#input_pkgs[@]}" != 0 ]; then if [ "${#input_pkgs[@]}" != 0 ]; then
@ -152,16 +152,16 @@ function kube::codegen::gen_helpers() {
# Defaults # Defaults
# #
local input_pkgs=() local input_pkgs=()
while read -r file; do while read -r dir; do
dir="$(dirname "${file}")"
pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)" pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)"
input_pkgs+=("${pkg}") input_pkgs+=("${pkg}")
done < <( done < <(
( kube::codegen::internal::git_grep -l \ ( kube::codegen::internal::git_grep -l --null \
-e '+k8s:defaulter-gen=' \ -e '+k8s:defaulter-gen=' \
":(glob)${root}"/'**/*.go' \ ":(glob)${root}"/'**/*.go' \
|| true \ || true \
) | LC_ALL=C sort -u ) | xargs -0 -n1 dirname \
| LC_ALL=C sort -u
) )
if [ "${#input_pkgs[@]}" != 0 ]; then if [ "${#input_pkgs[@]}" != 0 ]; then
@ -186,16 +186,16 @@ function kube::codegen::gen_helpers() {
# Conversions # Conversions
# #
local input_pkgs=() local input_pkgs=()
while read -r file; do while read -r dir; do
dir="$(dirname "${file}")"
pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)" pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)"
input_pkgs+=("${pkg}") input_pkgs+=("${pkg}")
done < <( done < <(
( kube::codegen::internal::git_grep -l \ ( kube::codegen::internal::git_grep -l --null \
-e '+k8s:conversion-gen=' \ -e '+k8s:conversion-gen=' \
":(glob)${root}"/'**/*.go' \ ":(glob)${root}"/'**/*.go' \
|| true \ || true \
) | LC_ALL=C sort -u ) | xargs -0 -n1 dirname \
| LC_ALL=C sort -u
) )
if [ "${#input_pkgs[@]}" != 0 ]; then if [ "${#input_pkgs[@]}" != 0 ]; then
@ -347,16 +347,16 @@ function kube::codegen::gen_openapi() {
root="$(cd "${root}" && pwd -P)" root="$(cd "${root}" && pwd -P)"
local input_pkgs=( "${extra_pkgs[@]:+"${extra_pkgs[@]}"}") local input_pkgs=( "${extra_pkgs[@]:+"${extra_pkgs[@]}"}")
while read -r file; do while read -r dir; do
dir="$(dirname "${file}")"
pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)" pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)"
input_pkgs+=("${pkg}") input_pkgs+=("${pkg}")
done < <( done < <(
( kube::codegen::internal::git_grep -l \ ( kube::codegen::internal::git_grep -l --null \
-e '+k8s:openapi-gen=' \ -e '+k8s:openapi-gen=' \
":(glob)${root}"/'**/*.go' \ ":(glob)${root}"/'**/*.go' \
|| true \ || true \
) | LC_ALL=C sort -u ) | xargs -0 -n1 dirname \
| LC_ALL=C sort -u
) )
if [ "${#input_pkgs[@]}" != 0 ]; then if [ "${#input_pkgs[@]}" != 0 ]; then
@ -396,7 +396,7 @@ function kube::codegen::gen_openapi() {
# #
# Args: # Args:
# --input-pkg-root <string> # --input-pkg-root <string>
# The root package under which to search for types.go files which request # The root package under which to search for *.go files which request
# clients to be generated. This must be Go package syntax, e.g. # clients to be generated. This must be Go package syntax, e.g.
# "k8s.io/foo/bar". # "k8s.io/foo/bar".
# #
@ -538,8 +538,7 @@ function kube::codegen::gen_client() {
local group_versions=() local group_versions=()
local input_pkgs=() local input_pkgs=()
while read -r file; do while read -r dir; do
dir="$(dirname "${file}")"
pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)" pkg="$(cd "${dir}" && GO111MODULE=on go list -find .)"
leaf="$(basename "${dir}")" leaf="$(basename "${dir}")"
if grep -E -q '^v[0-9]+((alpha|beta)[0-9]+)?$' <<< "${leaf}"; then if grep -E -q '^v[0-9]+((alpha|beta)[0-9]+)?$' <<< "${leaf}"; then
@ -550,11 +549,12 @@ function kube::codegen::gen_client() {
group_versions+=("${leaf2}/${leaf}") group_versions+=("${leaf2}/${leaf}")
fi fi
done < <( done < <(
( kube::codegen::internal::git_grep -l \ ( kube::codegen::internal::git_grep -l --null \
-e '+genclient' \ -e '+genclient' \
":(glob)${in_root}"/'**/types.go' \ ":(glob)${in_root}"/'**/types.go' \
|| true \ || true \
) | LC_ALL=C sort -u ) | xargs -0 -n1 dirname \
| LC_ALL=C sort -u
) )
if [ "${#group_versions[@]}" == 0 ]; then if [ "${#group_versions[@]}" == 0 ]; then