github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10691 from thockin/shutup-presubmit

Browse Source 
Shutup presubmit
This commit is contained in:
Yu-Ju Hong 2015-07-06 09:56:41 -07:00
commit dad97b6224
7 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/lib/etcd.sh
View File

@ -40,13 +40,13 @@ kube::etcd::start() {
# Start etcd # Start etcd
ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX) ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
kube::log::usage "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null" kube::log::info "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null & etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
ETCD_PID=$! ETCD_PID=$!
echo "Waiting for etcd to come up." echo "Waiting for etcd to come up."
kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80 kube::util::wait_for_url "http://${host}:${port}/v2/machines" "etcd: " 0.25 80
curl -X PUT "http://${host}:${port}/v2/keys/_test" curl -fs -X PUT "http://${host}:${port}/v2/keys/_test"
} }
kube::etcd::stop() { kube::etcd::stop() {

12
hack/update-swagger-spec.sh
View File

@ -54,17 +54,17 @@ KUBE_API_VERSIONS="v1,v1beta3" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
--public_address_override="127.0.0.1" \ --public_address_override="127.0.0.1" \
--kubelet_port=${KUBELET_PORT} \ --kubelet_port=${KUBELET_PORT} \
--runtime_config=api/v1beta3 \ --runtime_config=api/v1beta3 \
--service-cluster-ip-range="10.0.0.0/24" 1>&2 & --service-cluster-ip-range="10.0.0.0/24" >/dev/null 2>&1 &
APISERVER_PID=$! APISERVER_PID=$!
kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: " kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver: "
SWAGGER_API_PATH="http://127.0.0.1:${API_PORT}/swaggerapi/" SWAGGER_API_PATH="http://127.0.0.1:${API_PORT}/swaggerapi/"
kube::log::status "Updating " ${SWAGGER_ROOT_DIR} kube::log::status "Updating " ${SWAGGER_ROOT_DIR}
curl ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json curl -fs ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json
curl ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json curl -fs ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json
curl ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json curl -fs ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json
curl ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json curl -fs ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json
curl ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json curl -fs ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json
kube::log::status "SUCCESS" kube::log::status "SUCCESS"

1
hack/verify-gendocs.sh
View File

@ -22,7 +22,6 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
"${KUBE_ROOT}/hack/build-go.sh" cmd/gendocs cmd/genman cmd/genbashcomp
gendocs=$(kube::util::find-binary "gendocs") gendocs=$(kube::util::find-binary "gendocs")
genman=$(kube::util::find-binary "genman") genman=$(kube::util::find-binary "genman")

1
hack/verify-generated-conversions.sh
View File

@ -22,7 +22,6 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
"${KUBE_ROOT}/hack/build-go.sh" cmd/genconversion
genconversion=$(kube::util::find-binary "genconversion") genconversion=$(kube::util::find-binary "genconversion")

1
hack/verify-generated-deep-copies.sh
View File

@ -22,7 +22,6 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::golang::setup_env kube::golang::setup_env
"${KUBE_ROOT}/hack/build-go.sh" cmd/gendeepcopy
genconversion=$(kube::util::find-binary "gendeepcopy") genconversion=$(kube::util::find-binary "gendeepcopy")

1
hack/verify-swagger-spec.sh
View File

@ -30,7 +30,6 @@ _tmp="${KUBE_ROOT}/_tmp"
mkdir -p "${_tmp}" mkdir -p "${_tmp}"
cp -a "${SPECROOT}" "${TMP_SPECROOT}" cp -a "${SPECROOT}" "${TMP_SPECROOT}"
"${KUBE_ROOT}/hack/build-go.sh"
"${KUBE_ROOT}/hack/update-swagger-spec.sh" "${KUBE_ROOT}/hack/update-swagger-spec.sh"
echo "diffing ${SPECROOT} against freshly generated swagger spec" echo "diffing ${SPECROOT} against freshly generated swagger spec"
ret=0 ret=0

17
hooks/pre-commit
View File

@ -8,12 +8,22 @@ KUBE_HOOKS_DIR="$(dirname "$(test -L "$0" && echo "$(dirname $0)/$(readlink "$0"
exit_code=0 exit_code=0
echo -ne "Checking that it builds... "
if ! OUT=$("hack/build-go.sh" 2>&1); then
echo
echo "${red}${OUT}"
exit_code=1
else
echo "${green}OK"
fi
echo "${reset}"
echo -ne "Checking for files that need gofmt... " echo -ne "Checking for files that need gofmt... "
files_need_gofmt=() files_need_gofmt=()
files=($(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v -e "third_party" -e "Godeps")) files=($(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v -e "third_party" -e "Godeps"))
for file in "${files[@]}"; do for file in "${files[@]}"; do
# Check for files that fail gofmt. # Check for files that fail gofmt.
diff="$(git show ":${file}" | gofmt -s -d)" diff="$(git show ":${file}" | gofmt -s -d 2>&1)"
if [[ -n "$diff" ]]; then if [[ -n "$diff" ]]; then
files_need_gofmt+=("${file}") files_need_gofmt+=("${file}")
fi fi
@ -135,4 +145,7 @@ else
fi fi
echo "${reset}" echo "${reset}"
exit $exit_code if [[ "${exit_code}" != 0 ]]; then
echo "${red}Aborting commit${reset}"
fi
exit ${exit_code}