@@ -18,7 +18,7 @@ set -o errexit
18
18
set -o nounset
19
19
set -o pipefail
20
20
21
- KUBE_ROOT=$( dirname " ${BASH_SOURCE} " ) /..
21
+ KUBE_ROOT=$( dirname " ${BASH_SOURCE[0] } " ) /..
22
22
source " ${KUBE_ROOT} /hack/lib/init.sh"
23
23
24
24
kube::golang::setup_env
@@ -38,7 +38,7 @@ informergen=$(kube::util::find-binary "informer-gen")
38
38
# that generates the set-gen program.
39
39
#
40
40
41
- GROUP_VERSIONS=( ${KUBE_AVAILABLE_GROUP_VERSIONS} )
41
+ IFS= " " read -r -a GROUP_VERSIONS <<< " ${KUBE_AVAILABLE_GROUP_VERSIONS}"
42
42
GV_DIRS=()
43
43
for gv in " ${GROUP_VERSIONS[@]} " ; do
44
44
# add items, but strip off any leading apis/ you find to match command expectations
@@ -60,25 +60,20 @@ GV_DIRS_CSV=$(IFS=',';echo "${GV_DIRS[*]// /,}";IFS=$)
60
60
61
61
# This can be called with one flag, --verify-only, so it works for both the
62
62
# update- and verify- scripts.
63
- ${clientgen} --output-base " ${KUBE_ROOT} /vendor" --output-package=" k8s.io/client-go" --clientset-name=" kubernetes" --input-base=" k8s.io/kubernetes/vendor/k8s.io/api" --input=" ${GV_DIRS_CSV} " --go-header-file ${KUBE_ROOT} /hack/boilerplate/boilerplate.generatego.txt " $@ "
63
+ ${clientgen} --output-base " ${KUBE_ROOT} /vendor" --output-package=" k8s.io/client-go" --clientset-name=" kubernetes" --input-base=" k8s.io/kubernetes/vendor/k8s.io/api" --input=" ${GV_DIRS_CSV} " --go-header-file " ${KUBE_ROOT} /hack/boilerplate/boilerplate.generatego.txt" " $@ "
64
64
65
- listergen_external_apis=(
66
- $(
67
- cd ${KUBE_ROOT} /staging/src
68
- find k8s.io/api -name types.go | xargs -n1 dirname | sort
69
- )
65
+ mapfile -t listergen_external_apis < <(
66
+ cd " ${KUBE_ROOT} /staging/src"
67
+ find k8s.io/api -name types.go -print0 | xargs -0 -n1 dirname | sort
70
68
)
71
69
listergen_external_apis_csv=$( IFS=,; echo " ${listergen_external_apis[*]} " )
72
- ${listergen} --output-base " ${KUBE_ROOT} /vendor" --output-package " k8s.io/client-go/listers" --input-dirs " ${listergen_external_apis_csv} " --go-header-file ${KUBE_ROOT} /hack/boilerplate/boilerplate.generatego.txt " $@ "
70
+ ${listergen} --output-base " ${KUBE_ROOT} /vendor" --output-package " k8s.io/client-go/listers" --input-dirs " ${listergen_external_apis_csv} " --go-header-file " ${KUBE_ROOT} /hack/boilerplate/boilerplate.generatego.txt" " $@ "
73
71
74
- informergen_external_apis=(
75
- $(
76
- cd ${KUBE_ROOT} /staging/src
72
+ mapfile -t informergen_external_apis < <(
73
+ cd " ${KUBE_ROOT} /staging/src"
77
74
# because client-gen doesn't do policy/v1alpha1, we have to skip it too
78
- find k8s.io/api -name types.go | xargs -n1 dirname | sort | grep -v pkg.apis.policy.v1alpha1
79
- )
75
+ find k8s.io/api -name types.go -print0 | xargs -0 -n1 dirname | sort | grep -v pkg.apis.policy.v1alpha1
80
76
)
81
-
82
77
informergen_external_apis_csv=$( IFS=,; echo " ${informergen_external_apis[*]} " )
83
78
84
79
${informergen} \
@@ -88,7 +83,7 @@ ${informergen} \
88
83
--input-dirs " ${informergen_external_apis_csv} " \
89
84
--versioned-clientset-package k8s.io/client-go/kubernetes \
90
85
--listers-package k8s.io/client-go/listers \
91
- --go-header-file ${KUBE_ROOT} /hack/boilerplate/boilerplate.generatego.txt \
86
+ --go-header-file " ${KUBE_ROOT} /hack/boilerplate/boilerplate.generatego.txt" \
92
87
" $@ "
93
88
94
89
# You may add additional calls of code generators like set-gen above.
0 commit comments