Skip to content

Commit 9863f26

Browse files
committed
fix shellcheck failures of hack/update-codegen.sh
1 parent 3ef622d commit 9863f26

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
./hack/make-rules/vet.sh
4545
./hack/test-integration.sh
4646
./hack/test-update-storage-objects.sh
47-
./hack/update-codegen.sh
4847
./hack/update-generated-kms-dockerized.sh
4948
./hack/update-generated-protobuf-dockerized.sh
5049
./hack/update-generated-runtime-dockerized.sh

hack/update-codegen.sh

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
kube::golang::setup_env
@@ -38,7 +38,7 @@ informergen=$(kube::util::find-binary "informer-gen")
3838
# that generates the set-gen program.
3939
#
4040

41-
GROUP_VERSIONS=(${KUBE_AVAILABLE_GROUP_VERSIONS})
41+
IFS=" " read -r -a GROUP_VERSIONS <<< "${KUBE_AVAILABLE_GROUP_VERSIONS}"
4242
GV_DIRS=()
4343
for gv in "${GROUP_VERSIONS[@]}"; do
4444
# 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=$)
6060

6161
# This can be called with one flag, --verify-only, so it works for both the
6262
# 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" "$@"
6464

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
7068
)
7169
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" "$@"
7371

74-
informergen_external_apis=(
75-
$(
76-
cd ${KUBE_ROOT}/staging/src
72+
mapfile -t informergen_external_apis < <(
73+
cd "${KUBE_ROOT}/staging/src"
7774
# 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
8076
)
81-
8277
informergen_external_apis_csv=$(IFS=,; echo "${informergen_external_apis[*]}")
8378

8479
${informergen} \
@@ -88,7 +83,7 @@ ${informergen} \
8883
--input-dirs "${informergen_external_apis_csv}" \
8984
--versioned-clientset-package k8s.io/client-go/kubernetes \
9085
--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" \
9287
"$@"
9388

9489
# You may add additional calls of code generators like set-gen above.

0 commit comments

Comments
 (0)