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

Merge pull request #73914 from danielqsj/sc

Browse Source 
fix shellcheck in several files
This commit is contained in:
Kubernetes Prow Robot 2019-02-22 09:58:40 -08:00 committed by GitHub
commit 472b8a9a4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.shellcheck_failures
View File

@ -119,9 +119,6 @@
./hack/verify-test-images.sh ./hack/verify-test-images.sh
./hack/verify-test-owners.sh ./hack/verify-test-owners.sh
./hack/verify-typecheck.sh ./hack/verify-typecheck.sh
./pkg/kubectl/cmd/edit/testdata/record_testcase.sh
./pkg/util/verify-util-pkg.sh
./plugin/pkg/admission/imagepolicy/gencerts.sh
./test/cmd/apply.sh ./test/cmd/apply.sh
./test/cmd/apps.sh ./test/cmd/apps.sh
./test/cmd/authorization.sh ./test/cmd/authorization.sh

4
pkg/kubectl/cmd/edit/testdata/record_testcase.sh vendored
View File

@ -25,7 +25,7 @@ fi
# Clean up the test server # Clean up the test server
function cleanup { function cleanup {
if [[ ! -z "${pid-}" ]]; then if [[ -n "${pid-}" ]]; then
echo "Stopping recording server (${pid})" echo "Stopping recording server (${pid})"
# kill the process `go run` launched # kill the process `go run` launched
pkill -P "${pid}" pkill -P "${pid}"
@ -36,7 +36,7 @@ function cleanup {
testcase="${1}" testcase="${1}"
test_root="$(dirname "${BASH_SOURCE}")" test_root="$(dirname "${BASH_SOURCE[0]}")"
testcase_dir="${test_root}/testcase-${testcase}" testcase_dir="${test_root}/testcase-${testcase}"
mkdir -p "${testcase_dir}" mkdir -p "${testcase_dir}"

6
pkg/util/verify-util-pkg.sh
View File

@ -21,7 +21,7 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
BASH_DIR=$(dirname "${BASH_SOURCE}") BASH_DIR=$(dirname "${BASH_SOURCE[0]}")
find_go_files() { find_go_files() {
find . -maxdepth 1 -not \( \ find . -maxdepth 1 -not \( \
@ -34,8 +34,8 @@ find_go_files() {
ret=0 ret=0
pushd "${BASH_DIR}" > /dev/null pushd "${BASH_DIR}" > /dev/null
for path in `find_go_files`; do for path in $(find_go_files); do
file=$(basename $path) file=$(basename "$path")
echo "Found pkg/util/${file}, but should be moved into util sub-pkgs." 1>&2 echo "Found pkg/util/${file}, but should be moved into util sub-pkgs." 1>&2
ret=1 ret=1
done done

16
plugin/pkg/admission/imagepolicy/gencerts.sh
View File

@ -83,12 +83,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// This file was generated using openssl by the gencerts.sh script
// and holds raw certificates for the imagepolicy webhook tests.
package imagepolicy
EOF EOF
echo "// This file was generated using openssl by the gencerts.sh script" >> $outfile
echo "// and holds raw certificates for the imagepolicy webhook tests." >> $outfile
echo "" >> $outfile
echo "package imagepolicy" >> $outfile
for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clientCert; do for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clientCert; do
data=$(cat ${file}.pem) data=$(cat ${file}.pem)
echo "" >> $outfile echo "" >> $outfile
@ -96,7 +96,7 @@ for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clien
done done
# Clean up after we're done. # Clean up after we're done.
rm *.pem rm ./*.pem
rm *.csr rm ./*.csr
rm *.srl rm ./*.srl
rm *.conf rm ./*.conf