Skip to content

Commit d065dd2

Browse files
committed
fix shellcheck in k8s.io/metrics
1 parent 2de487c commit d065dd2

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

hack/.shellcheck_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@
155155
./pkg/kubectl/cmd/edit/testdata/record_testcase.sh
156156
./pkg/util/verify-util-pkg.sh
157157
./plugin/pkg/admission/imagepolicy/gencerts.sh
158-
./staging/src/k8s.io/metrics/hack/update-codegen.sh
159-
./staging/src/k8s.io/metrics/hack/verify-codegen.sh
160158
./test/cmd/apply.sh
161159
./test/cmd/apps.sh
162160
./test/cmd/authorization.sh

staging/src/k8s.io/metrics/hack/update-codegen.sh

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

21-
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
22-
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
22+
CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
2323

2424
# generate the code with:
2525
# --output-base because this script should also be able to run inside the vendor dir of
@@ -28,13 +28,13 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-ge
2828
#
2929
# we skip informers and listers for metrics, because we don't quite support the requisite operations yet
3030
# we skip generating the internal clientset as it's not really needed
31-
${CODEGEN_PKG}/generate-internal-groups.sh deepcopy,conversion \
31+
"${CODEGEN_PKG}/generate-internal-groups.sh" deepcopy,conversion \
3232
k8s.io/metrics/pkg/client k8s.io/metrics/pkg/apis k8s.io/metrics/pkg/apis \
3333
"metrics:v1alpha1,v1beta1 custom_metrics:v1beta1 external_metrics:v1beta1" \
34-
--output-base "$(dirname ${BASH_SOURCE})/../../.." \
35-
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
36-
${CODEGEN_PKG}/generate-groups.sh client \
34+
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
35+
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
36+
"${CODEGEN_PKG}/generate-groups.sh" client \
3737
k8s.io/metrics/pkg/client k8s.io/metrics/pkg/apis \
3838
"metrics:v1alpha1,v1beta1" \
39-
--output-base "$(dirname ${BASH_SOURCE})/../../.." \
40-
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
39+
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
40+
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"

staging/src/k8s.io/metrics/hack/verify-codegen.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
22-
SCRIPT_BASE=${SCRIPT_ROOT}/../..
21+
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2322

2423
DIFFROOT="${SCRIPT_ROOT}/pkg"
2524
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"

0 commit comments

Comments
 (0)