github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73219 from danielqsj/csi-api 

fix shellcheck in csi-api
pull/564/head
Kubernetes Prow Robot 2019-02-08 06:53:52 -08:00 committed by GitHub
parent 26af19b3a4 81b7407557
commit 30397a3d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.shellcheck_failures
View File

@ -156,8 +156,6 @@
./pkg/kubectl/cmd/edit/testdata/record_testcase.sh ./pkg/kubectl/cmd/edit/testdata/record_testcase.sh
./pkg/util/verify-util-pkg.sh ./pkg/util/verify-util-pkg.sh
./plugin/pkg/admission/imagepolicy/gencerts.sh ./plugin/pkg/admission/imagepolicy/gencerts.sh
./staging/src/k8s.io/csi-api/hack/update-codegen.sh
./staging/src/k8s.io/csi-api/hack/verify-codegen.sh
./staging/src/k8s.io/kube-aggregator/hack/build-image.sh ./staging/src/k8s.io/kube-aggregator/hack/build-image.sh
./staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh ./staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh
./staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh ./staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh

10
staging/src/k8s.io/csi-api/hack/update-codegen.sh
View File

@ -18,15 +18,15 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/.. SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)} CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
# generate the code with: # generate the code with:
# --output-base because this script should also be able to run inside the vendor dir of # --output-base because this script should also be able to run inside the vendor dir of
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir # k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
# instead of the $GOPATH directly. For normal projects this can be dropped. # instead of the $GOPATH directly. For normal projects this can be dropped.
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \ "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
k8s.io/csi-api/pkg/client k8s.io/csi-api/pkg/apis \ k8s.io/csi-api/pkg/client k8s.io/csi-api/pkg/apis \
csi:v1alpha1 \ csi:v1alpha1 \
--output-base "$(dirname ${BASH_SOURCE})/../../.." \ --output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt

2
staging/src/k8s.io/csi-api/hack/verify-codegen.sh
View File

@ -18,7 +18,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
DIFFROOT="${SCRIPT_ROOT}/pkg" DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg" TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"