Skip to content

Commit 219c856

Browse files
authored
Merge pull request kubernetes#91555 from daixiang0/scr
*.sh: cleanup all white noise
2 parents 2e5db29 + e09bc31 commit 219c856

File tree

15 files changed

+20
-20
lines changed

15 files changed

+20
-20
lines changed

cluster/get-kube-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function download_tarball() {
147147
local -r download_path="$1"
148148
local -r file="$2"
149149
local trace_on="off"
150-
if [[ -o xtrace ]]; then
150+
if [[ -o xtrace ]]; then
151151
trace_on="on"
152152
set +x
153153
fi

cluster/images/conformance/run_e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ saveResults() {
3737
}
3838

3939
# Optional Golang runner alternative to the bash script.
40-
# Entry provided via env var to simplify invocation.
40+
# Entry provided via env var to simplify invocation.
4141
if [[ -n ${E2E_USE_GO_RUNNER:-} ]]; then
4242
set -x
4343
/gorunner && ret=0 || ret=$?

cluster/kubemark/gce/config-default.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:-"--v=4"}"
3131
KUBE_GCE_INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-"default"}"
3232

3333
# NUM_NODES is used by start-kubemark.sh to determine a correct number of replicas.
34-
NUM_NODES=${KUBEMARK_NUM_NODES:-10}
34+
NUM_NODES=${KUBEMARK_NUM_NODES:-10}
3535
NUM_WINDOWS_NODES=${KUBEMARK_NUM_WINDOWS_NODES:-0}
3636

3737
HOLLOW_KUBELET_TEST_LOG_LEVEL="${HOLLOW_KUBELET_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"

cluster/log-dump/log-dump.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ function save-windows-logs-via-ssh() {
270270

271271
export-windows-docker-event-log "${node}"
272272
export-windows-docker-images-list "${node}"
273-
273+
274274
local remote_files=()
275275
for file in ${windows_node_logfiles[@]}; do
276276
remote_files+=( "${WINDOWS_LOGS_DIR}\\${file}" )

hack/ginkgo-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-${KUBE_CONTAINER_RUNTIME:-}}
149149
# The --host setting is used only when providing --auth_config
150150
# If --kubeconfig is used, the host to use is retrieved from the .kubeconfig
151151
# file and the one provided with --host is ignored.
152-
# Add path for things like running kubectl binary.
152+
# Add path for things like running kubectl binary.
153153
PATH=$(dirname "${e2e_test}"):"${PATH}"
154154
export PATH
155155
"${ginkgo}" "${ginkgo_args[@]:+${ginkgo_args[@]}}" "${e2e_test}" -- \

hack/lib/util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ kube::util::find-binary-for-platform() {
213213
locations+=("$location");
214214
done < <(find "${KUBE_ROOT}/bazel-bin/" -type f -perm -111 \
215215
\( -path "*/${platform/\//_}*/${lookfor}" -o -path "*/${lookfor}" \) 2>/dev/null || true)
216-
216+
217217
# List most recently-updated location.
218218
local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
219219
echo -n "${bin}"

hack/lint-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ for forbidden_repo in "${forbidden_repos[@]}"; do
7676
done
7777

7878
outdated=$(go list -m -json all | jq -r "
79-
select(.Replace.Version != null) |
80-
select(.Version != .Replace.Version) |
79+
select(.Replace.Version != null) |
80+
select(.Version != .Replace.Version) |
8181
${filter}
8282
select(.Path) |
8383
\"\(.Path)

hack/make-rules/test-cmd.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ function run_kube_apiserver() {
7676
}
7777

7878
# Runs run_kube_controller_manager
79-
#
79+
#
8080
# Exports:
8181
# CTLRMGR_PID
8282
function run_kube_controller_manager() {
@@ -96,7 +96,7 @@ function run_kube_controller_manager() {
9696

9797
# Creates a node object with name 127.0.0.1. This is required because we do not
9898
# run kubelet.
99-
#
99+
#
100100
# Exports:
101101
# SUPPORTED_RESOURCES(Array of all resources supported by the apiserver).
102102
function create_node() {
@@ -121,7 +121,7 @@ __EOF__
121121
# 2) $WHAT is not empty and kubeadm is part of $WHAT
122122
WHAT=${WHAT:-}
123123
if [[ ${WHAT} == "" || ${WHAT} =~ .*kubeadm.* ]] ; then
124-
kube::log::status "Running kubeadm tests"
124+
kube::log::status "Running kubeadm tests"
125125

126126
# build kubeadm
127127
make all -C "${KUBE_ROOT}" WHAT=cmd/kubeadm

hack/make-rules/test-e2e-kubeadm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [[ ! -d "${artifacts}" ]]; then
5555
fi
5656
echo "Test artifacts will be written to ${artifacts}"
5757

58-
# Test
58+
# Test
5959
kube::golang::verify_go_version
6060

6161
go run test/e2e_kubeadm/runner/local/run_local.go \

hack/make-rules/test-e2e-node.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extra_envs=${EXTRA_ENVS:-}
4646

4747
# Parse the flags to pass to ginkgo
4848
ginkgoflags=""
49-
if [[ ${parallelism} -gt 1 ]]; then
49+
if [[ ${parallelism} -gt 1 ]]; then
5050
ginkgoflags="${ginkgoflags} -nodes=${parallelism} "
5151
fi
5252

0 commit comments

Comments
 (0)