Match shell style guide.

Looking at https://google-styleguide.googlecode.com/svn/trunk/shell.xml
This commit is contained in:
Joe Beda 2014-09-09 15:03:32 -07:00
parent c5cb7202af
commit ed5bfa2f0f
16 changed files with 141 additions and 144 deletions

View File

@ -34,17 +34,17 @@ else
echo "WARNING: No version information provided in build image" echo "WARNING: No version information provided in build image"
fi fi
function make-binary() { function kube::build::make_binary() {
local -r gopkg=$1 local -r gopkg=$1
local -r bin=${gopkg##*/} local -r bin=${gopkg##*/}
echo "+++ Building ${bin} for ${GOOS}/${GOARCH}" echo "+++ Building ${bin} for ${GOOS}/${GOARCH}"
pushd "${KUBE_REPO_ROOT}" pushd "${KUBE_REPO_ROOT}" >/dev/null
godep go build -ldflags "${KUBE_LD_FLAGS-}" -o "${ARCH_TARGET}/${bin}" "${gopkg}" godep go build -ldflags "${KUBE_LD_FLAGS-}" -o "${ARCH_TARGET}/${bin}" "${gopkg}"
popd popd >/dev/null
} }
function make-binaries() { function kube::build::make_binaries() {
if [[ ${#targets[@]} -eq 0 ]]; then if [[ ${#targets[@]} -eq 0 ]]; then
targets=( targets=(
cmd/proxy cmd/proxy
@ -66,12 +66,12 @@ function make-binaries() {
mkdir -p "${ARCH_TARGET}" mkdir -p "${ARCH_TARGET}"
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then
make-binary "$1" kube::build::make_binary "$1"
exit 0 exit 0
fi fi
local b local b
for b in "${binaries[@]}"; do for b in "${binaries[@]}"; do
make-binary "$b" kube::build::make_binary "$b"
done done
} }

View File

@ -14,10 +14,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This and builds all go components.
set -e set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
make-binaries "$@" kube::build::make_binaries "$@"

View File

@ -14,14 +14,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# This and builds all go components.
set -e set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
readonly CROSS_BINARIES=( readonly CROSS_BINARIES=(
"./cmd/kubecfg" ./cmd/kubecfg
) )
for platform in ${KUBE_CROSSPLATFORMS}; do for platform in ${KUBE_CROSSPLATFORMS}; do
@ -29,7 +27,7 @@ for platform in ${KUBE_CROSSPLATFORMS}; do
export GOOS=${platform%/*} export GOOS=${platform%/*}
export GOARCH=${platform##*/} export GOARCH=${platform##*/}
for binary in "${CROSS_BINARIES[@]}"; do for binary in "${CROSS_BINARIES[@]}"; do
make-binaries "${binary}" kube::build::make_binaries "${binary}"
done done
) )
done done

View File

@ -18,13 +18,15 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
ETCD_DIR="${KUBE_REPO_ROOT}/_output/etcd" kube::build::make_binaries "./cmd/integration"
readonly ETCD_DIR="${KUBE_REPO_ROOT}/_output/etcd"
mkdir -p "${ETCD_DIR}" mkdir -p "${ETCD_DIR}"
echo "+++ Running integration test" echo "+++ Running integration test"
etcd -name test -data-dir ${ETCD_DIR} > "${KUBE_REPO_ROOT}/_output/etcd.log" & etcd -name test -data-dir ${ETCD_DIR} > "${KUBE_REPO_ROOT}/_output/etcd.log" &
ETCD_PID=$! readonly ETCD_PID=$!
sleep 5 sleep 5

View File

@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
set -e set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh

View File

@ -56,7 +56,7 @@ readonly RELEASE_DIR="${KUBE_REPO_ROOT}/_output/release"
# Basic setup functions # Basic setup functions
# Verify that the right utilities and such are installed for building Kube. # Verify that the right utilities and such are installed for building Kube.
function kube::build::verify-prereqs() { function kube::build::verify_prereqs() {
if [[ -z "$(which docker)" ]]; then if [[ -z "$(which docker)" ]]; then
echo "Can't find 'docker' in PATH, please fix and retry." >&2 echo "Can't find 'docker' in PATH, please fix and retry." >&2
echo "See https://docs.docker.com/installation/#installation for installation instructions." >&2 echo "See https://docs.docker.com/installation/#installation for installation instructions." >&2
@ -91,9 +91,9 @@ function kube::build::verify-prereqs() {
# Building # Building
# Set up the context directory for the kube-build image and build it. # Set up the context directory for the kube-build image and build it.
function kube::build::build-image() { function kube::build::build_image() {
local -r BUILD_CONTEXT_DIR="${KUBE_REPO_ROOT}/_output/images/${KUBE_BUILD_IMAGE}" local -r build_context_dir="${KUBE_REPO_ROOT}/_output/images/${KUBE_BUILD_IMAGE}"
local -r SOURCE=( local -r source=(
api api
build build
cmd cmd
@ -106,97 +106,98 @@ function kube::build::build-image() {
README.md README.md
third_party third_party
) )
mkdir -p ${BUILD_CONTEXT_DIR} mkdir -p "${build_context_dir}"
tar czf ${BUILD_CONTEXT_DIR}/kube-source.tar.gz "${SOURCE[@]}" tar czf "${build_context_dir}/kube-source.tar.gz" "${source[@]}"
cat >${BUILD_CONTEXT_DIR}/kube-version-defs <<EOF cat >"${build_context_dir}/kube-version-defs" <<EOF
KUBE_LD_FLAGS="$(kube::version_ldflags)" KUBE_LD_FLAGS="$(kube::version_ldflags)"
EOF EOF
cp build/build-image/Dockerfile ${BUILD_CONTEXT_DIR}/Dockerfile cp build/build-image/Dockerfile ${build_context_dir}/Dockerfile
kube::build::docker-build "${KUBE_BUILD_IMAGE}" "${BUILD_CONTEXT_DIR}" kube::build::docker_build "${KUBE_BUILD_IMAGE}" "${build_context_dir}"
} }
# Builds the runtime image. Assumes that the appropriate binaries are already # Builds the runtime image. Assumes that the appropriate binaries are already
# built and in _output/build/. # built and in _output/build/.
function kube::build::run-image() { function kube::build::run_image() {
local -r BUILD_CONTEXT_BASE="${KUBE_REPO_ROOT}/_output/images/${KUBE_RUN_IMAGE_BASE}" local -r build_context_base="${KUBE_REPO_ROOT}/_output/images/${KUBE_RUN_IMAGE_BASE}"
# First build the base image. This one brings in all of the binaries. # First build the base image. This one brings in all of the binaries.
mkdir -p "${BUILD_CONTEXT_BASE}" mkdir -p "${build_context_base}"
tar czf ${BUILD_CONTEXT_BASE}/kube-bins.tar.gz \ tar czf "${build_context_base}/kube-bins.tar.gz" \
-C "_output/build/linux/amd64" \ -C "_output/build/linux/amd64" \
"${KUBE_RUN_BINARIES[@]}" "${KUBE_RUN_BINARIES[@]}"
cp -R build/run-images/base/* "${BUILD_CONTEXT_BASE}/" cp -R build/run-images/base/* "${build_context_base}/"
kube::build::docker-build "${KUBE_RUN_IMAGE_BASE}" "${BUILD_CONTEXT_BASE}" kube::build::docker_build "${KUBE_RUN_IMAGE_BASE}" "${build_context_base}"
local b local b
for b in "${KUBE_RUN_BINARIES[@]}" ; do for b in "${KUBE_RUN_BINARIES[@]}" ; do
local SUB_CONTEXT_DIR="${BUILD_CONTEXT_BASE}-$b" local sub_context_dir="${build_context_base}-$b"
mkdir -p "${SUB_CONTEXT_DIR}" mkdir -p "${sub_context_dir}"
cp -R build/run-images/$b/* "${SUB_CONTEXT_DIR}/" cp -R build/run-images/$b/* "${sub_context_dir}/"
kube::build::docker-build "${KUBE_RUN_IMAGE_BASE}-$b" "${SUB_CONTEXT_DIR}" kube::build::docker_build "${KUBE_RUN_IMAGE_BASE}-$b" "${sub_context_dir}"
done done
} }
function kube::build::clean-images() { function kube::build::clean_images() {
# Clean the build image kube::build::clean_image "${KUBE_BUILD_IMAGE}"
kube::build::clean-image "${KUBE_BUILD_IMAGE}"
kube::build::clean_image "${KUBE_RUN_IMAGE_BASE}"
local b local b
for b in "${KUBE_RUN_BINARIES[@]}" ; do for b in "${KUBE_RUN_BINARIES[@]}" ; do
kube::build::clean-image "${KUBE_RUN_IMAGE_BASE}-${b}" kube::build::clean_image "${KUBE_RUN_IMAGE_BASE}-${b}"
done done
echo "+++ Cleaning all other untagged docker images" echo "+++ Cleaning all other untagged docker images"
docker rmi $(docker images | grep "^<none>" | awk '{print $3}') 2> /dev/null docker rmi $(docker images | awk '/^<none>/ {print $3}') 2> /dev/null || true
} }
# Build a docker image from a Dockerfile. # Build a docker image from a Dockerfile.
# $1 is the name of the image to build # $1 is the name of the image to build
# $2 is the location of the "context" directory, with the Dockerfile at the root. # $2 is the location of the "context" directory, with the Dockerfile at the root.
function kube::build::docker-build() { function kube::build::docker_build() {
local -r IMAGE=$1 local -r image=$1
local -r CONTEXT_DIR=$2 local -r context_dir=$2
local -r BUILD_CMD="docker build -t ${IMAGE} ${CONTEXT_DIR}" local -r build_cmd="docker build -t ${image} ${context_dir}"
echo "+++ Building Docker image ${IMAGE}. This can take a while." echo "+++ Building Docker image ${image}. This can take a while."
set +e # We are handling the error here manually set +e # We are handling the error here manually
local -r DOCKER_OUTPUT="$(${BUILD_CMD} 2>&1)" local -r docker_output="$(${build_cmd} 2>&1)"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
set -e set -e
echo "+++ Docker build command failed for ${IMAGE}" >&2 echo "+++ Docker build command failed for ${image}" >&2
echo >&2 echo >&2
echo "${DOCKER_OUTPUT}" >&2 echo "${docker_output}" >&2
echo >&2 echo >&2
echo "To retry manually, run:" >&2 echo "To retry manually, run:" >&2
echo >&2 echo >&2
echo " ${DOCKER_BUILD_CMD}" >&2 echo " ${build_cmd}" >&2
echo >&2 echo >&2
return 1 return 1
fi fi
set -e set -e
} }
function kube::build::clean-image() { function kube::build::clean_image() {
local -r IMAGE=$1 local -r image=$1
echo "+++ Deleting docker image ${IMAGE}" echo "+++ Deleting docker image ${image}"
docker rmi ${IMAGE} 2> /dev/null || true docker rmi ${image} 2> /dev/null || true
} }
# Run a command in the kube-build image. This assumes that the image has # Run a command in the kube-build image. This assumes that the image has
# already been built. This will sync out all output data from the build. # already been built. This will sync out all output data from the build.
function kube::build::run-build-command() { function kube::build::run_build_command() {
[[ -n "$@" ]] || { echo "Invalid input." >&2; return 4; } [[ -n "$@" ]] || { echo "Invalid input." >&2; return 4; }
local -r DOCKER="docker run --rm --name=${DOCKER_CONTAINER_NAME} -it ${DOCKER_MOUNT} ${KUBE_BUILD_IMAGE}" local -r docker="docker run --rm --name=${DOCKER_CONTAINER_NAME} -it ${DOCKER_MOUNT} ${KUBE_BUILD_IMAGE}"
docker rm ${DOCKER_CONTAINER_NAME} >/dev/null 2>&1 || true docker rm ${DOCKER_CONTAINER_NAME} >/dev/null 2>&1 || true
${DOCKER} "$@" ${docker} "$@"
} }
# If the Docker server is remote, copy the results back out. # If the Docker server is remote, copy the results back out.
function kube::build::copy-output() { function kube::build::copy_output() {
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
# When we are on the Mac with boot2docker we need to copy the results back # When we are on the Mac with boot2docker we need to copy the results back
# out. Ideally we would leave the container around and use 'docker cp' to # out. Ideally we would leave the container around and use 'docker cp' to
@ -207,7 +208,7 @@ function kube::build::copy-output() {
# The easiest thing I (jbeda) could figure out was to launch another # The easiest thing I (jbeda) could figure out was to launch another
# container pointed at the same volume, tar the output directory and ship # container pointed at the same volume, tar the output directory and ship
# that tar over stdou. # that tar over stdou.
local DOCKER="docker run -a stdout --rm --name=${DOCKER_CONTAINER_NAME} ${DOCKER_MOUNT} ${KUBE_BUILD_IMAGE}" local -r docker="docker run -a stdout --rm --name=${DOCKER_CONTAINER_NAME} ${DOCKER_MOUNT} ${KUBE_BUILD_IMAGE}"
# Kill any leftover container # Kill any leftover container
docker rm ${DOCKER_CONTAINER_NAME} >/dev/null 2>&1 || true docker rm ${DOCKER_CONTAINER_NAME} >/dev/null 2>&1 || true
@ -215,7 +216,7 @@ function kube::build::copy-output() {
echo "+++ Syncing back _output directory from boot2docker VM" echo "+++ Syncing back _output directory from boot2docker VM"
mkdir -p "${LOCAL_OUTPUT_DIR}" mkdir -p "${LOCAL_OUTPUT_DIR}"
rm -rf "${LOCAL_OUTPUT_DIR}/*" rm -rf "${LOCAL_OUTPUT_DIR}/*"
${DOCKER} sh -c "tar c -C ${REMOTE_OUTPUT_DIR} ." \ ${docker} sh -c "tar c -C ${REMOTE_OUTPUT_DIR} ." \
| tar xv -C "${LOCAL_OUTPUT_DIR}" | tar xv -C "${LOCAL_OUTPUT_DIR}"
# I (jbeda) also tried getting rsync working using 'docker run' as the # I (jbeda) also tried getting rsync working using 'docker run' as the
@ -232,27 +233,25 @@ function kube::build::copy-output() {
# Build final release artifacts # Build final release artifacts
# Package up all of the cross compiled clients # Package up all of the cross compiled clients
function kube::build::package-tarballs() { function kube::build::package_tarballs() {
mkdir -p "${RELEASE_DIR}" mkdir -p "${RELEASE_DIR}"
# Find all of the built kubecfg binaries # Find all of the built kubecfg binaries
local platform local platform
for platform in _output/build/*/* ; do for platform in _output/build/*/* ; do
local PLATFORM_TAG=${platform} local platform_tag=${platform}
PLATFORM_TAG=${PLATFORM_TAG#*/*/} # remove the first two path components platform_tag=${platform_tag#*/*/} # remove the first two path components
PLATFORM_TAG=${PLATFORM_TAG/\//-} # Replace a "/" for a "-" platform_tag=${platform_tag/\//-} # Replace a "/" for a "-"
echo "+++ Building client package for $PLATFORM_TAG" echo "+++ Building client package for $platform_tag"
local CLIENT_RELEASE_STAGE="${KUBE_REPO_ROOT}/_output/release-stage/${PLATFORM_TAG}/kubernetes" local client_release_stage="${KUBE_REPO_ROOT}/_output/release-stage/${platform_tag}/kubernetes"
mkdir -p "${CLIENT_RELEASE_STAGE}" mkdir -p "${client_release_stage}"
mkdir -p "${CLIENT_RELEASE_STAGE}/bin" mkdir -p "${client_release_stage}/bin"
cp "${platform}"/* "${CLIENT_RELEASE_STAGE}/bin" cp "${platform}"/* "${client_release_stage}/bin"
local CLIENT_PACKAGE_NAME="${RELEASE_DIR}/kubernetes-${PLATFORM_TAG}.tar.gz" local client_package_name="${RELEASE_DIR}/kubernetes-${platform_tag}.tar.gz"
tar czf "${CLIENT_PACKAGE_NAME}" \ tar czf "${client_package_name}" -C "${client_release_stage}/.." .
-C "${CLIENT_RELEASE_STAGE}/.." \
.
done done
} }
@ -260,14 +259,14 @@ function kube::build::package-tarballs() {
# GCS Release # GCS Release
function kube::release::gcs::release() { function kube::release::gcs::release() {
kube::release::gcs::verify-prereqs kube::release::gcs::verify_prereqs
kube::release::gcs::ensure-release-bucket kube::release::gcs::ensure_release_bucket
kube::release::gcs::push-images kube::release::gcs::push_images
kube::release::gcs::copy-release-tarballs kube::release::gcs::copy_release_tarballs
} }
# Verify things are set up for uploading to GCS # Verify things are set up for uploading to GCS
function kube::release::gcs::verify-prereqs() { function kube::release::gcs::verify_prereqs() {
if [[ -z "$(which gsutil)" || -z "$(which gcloud)" ]]; then if [[ -z "$(which gsutil)" || -z "$(which gcloud)" ]]; then
echo "Releasing Kubernetes requires gsutil and gcloud. Please download," echo "Releasing Kubernetes requires gsutil and gcloud. Please download,"
echo "install and authorize through the Google Cloud SDK: " echo "install and authorize through the Google Cloud SDK: "
@ -298,7 +297,7 @@ function kube::release::gcs::verify-prereqs() {
} }
# Create a unique bucket name for releasing Kube and make sure it exists. # Create a unique bucket name for releasing Kube and make sure it exists.
function kube::release::gcs::ensure-release-bucket() { function kube::release::gcs::ensure_release_bucket() {
local project_hash local project_hash
if which md5 > /dev/null 2>&1; then if which md5 > /dev/null 2>&1; then
project_hash=$(md5 -q -s "$GCLOUD_PROJECT") project_hash=$(md5 -q -s "$GCLOUD_PROJECT")
@ -316,65 +315,66 @@ function kube::release::gcs::ensure-release-bucket() {
fi fi
} }
function kube::release::gcs::ensure-docker-registry() { function kube::release::gcs::ensure_docker_registry() {
local -r REG_CONTAINER_NAME="gcs-registry" local -r reg_container_name="gcs-registry"
local -r RUNNING=$(docker inspect ${REG_CONTAINER_NAME} 2>/dev/null \ local -r running=$(docker inspect ${reg_container_name} 2>/dev/null \
| build/json-extractor.py 0.State.Running 2>/dev/null) | build/json-extractor.py 0.State.Running 2>/dev/null)
[[ "$RUNNING" != "true" ]] || return 0 [[ "$running" != "true" ]] || return 0
# Grovel around and find the OAuth token in the gcloud config # Grovel around and find the OAuth token in the gcloud config
local -r BOTO=~/.config/gcloud/legacy_credentials/${GCLOUD_ACCOUNT}/.boto local -r boto=~/.config/gcloud/legacy_credentials/${GCLOUD_ACCOUNT}/.boto
local -r REFRESH_TOKEN=$(grep 'gs_oauth2_refresh_token =' $BOTO | awk '{ print $3 }') local -r refresh_token=$(grep 'gs_oauth2_refresh_token =' $boto | awk '{ print $3 }')
if [[ -z $REFRESH_TOKEN ]]; then if [[ -z "$refresh_token" ]]; then
echo "Couldn't find OAuth 2 refresh token in ${BOTO}" >&2 echo "Couldn't find OAuth 2 refresh token in ${boto}" >&2
return 1 return 1
fi fi
# If we have an old one sitting around, remove it # If we have an old one sitting around, remove it
docker rm ${REG_CONTAINER_NAME} >/dev/null 2>&1 || true docker rm ${reg_container_name} >/dev/null 2>&1 || true
echo "+++ Starting GCS backed Docker registry" echo "+++ Starting GCS backed Docker registry"
local DOCKER="docker run -d --name=${REG_CONTAINER_NAME} " local docker="docker run -d --name=${reg_container_name} "
DOCKER+="-e GCS_BUCKET=${KUBE_RELEASE_BUCKET} " docker+="-e GCS_BUCKET=${KUBE_RELEASE_BUCKET} "
DOCKER+="-e STORAGE_PATH=${KUBE_DOCKER_REG_PREFIX} " docker+="-e STORAGE_PATH=${KUBE_DOCKER_REG_PREFIX} "
DOCKER+="-e GCP_OAUTH2_REFRESH_TOKEN=${REFRESH_TOKEN} " docker+="-e GCP_OAUTH2_REFRESH_TOKEN=${refresh_token} "
DOCKER+="-p 127.0.0.1:5000:5000 " docker+="-p 127.0.0.1:5000:5000 "
DOCKER+="google/docker-registry" docker+="google/docker-registry"
${DOCKER} ${docker}
# Give it time to spin up before we start throwing stuff at it # Give it time to spin up before we start throwing stuff at it
sleep 5 sleep 5
} }
function kube::release::gcs::push-images() { function kube::release::gcs::push_images() {
kube::release::gcs::ensure-docker-registry kube::release::gcs::ensure_docker_registry
# Tag each of our run binaries with the right registry and push # Tag each of our run binaries with the right registry and push
local b local b image_name
for b in "${KUBE_RUN_BINARIES[@]}" ; do for b in "${KUBE_RUN_BINARIES[@]}" ; do
echo "+++ Tagging and pushing ${KUBE_RUN_IMAGE_BASE}-$b to GCS bucket ${KUBE_RELEASE_BUCKET}" image_name="${KUBE_RUN_IMAGE_BASE}-${b}"
docker tag "${KUBE_RUN_IMAGE_BASE}-$b" "localhost:5000/${KUBE_RUN_IMAGE_BASE}-$b" echo "+++ Tagging and pushing ${image_name} to GCS bucket ${KUBE_RELEASE_BUCKET}"
docker push "localhost:5000/${KUBE_RUN_IMAGE_BASE}-$b" docker tag "${KUBE_RUN_IMAGE_BASE}-$b" "localhost:5000/${image_name}"
docker rmi "localhost:5000/${KUBE_RUN_IMAGE_BASE}-$b" docker push "localhost:5000/${image_name}"
docker rmi "localhost:5000/${image_name}"
done done
} }
function kube::release::gcs::copy-release-tarballs() { function kube::release::gcs::copy_release_tarballs() {
# TODO: This isn't atomic. There will be points in time where there will be # TODO: This isn't atomic. There will be points in time where there will be
# no active release. Also, if something fails, the release could be half- # no active release. Also, if something fails, the release could be half-
# copied. The real way to do this would perhaps to have some sort of release # copied. The real way to do this would perhaps to have some sort of release
# version so that we are never overwriting a destination. # version so that we are never overwriting a destination.
local -r GCS_DESTINATION="gs://${KUBE_RELEASE_BUCKET}/${KUBE_RELEASE_PREFIX}" local -r gcs_destination="gs://${KUBE_RELEASE_BUCKET}/${KUBE_RELEASE_PREFIX}"
echo "+++ Copying client tarballs to ${GCS_DESTINATION}" echo "+++ Copying client tarballs to ${gcs_destination}"
# First delete all objects at the destination # First delete all objects at the destination
gsutil -q rm -f -R "${GCS_DESTINATION}" >/dev/null 2>&1 || true gsutil -q rm -f -R "${gcs_destination}" >/dev/null 2>&1 || true
# Now upload everything in release directory # Now upload everything in release directory
gsutil -m cp -r "${RELEASE_DIR}" "${GCS_DESTINATION}" >/dev/null 2>&1 gsutil -m cp -r "${RELEASE_DIR}" "${gcs_destination}" >/dev/null 2>&1
} }

View File

@ -23,5 +23,5 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::copy-output kube::build::copy_output

View File

@ -23,6 +23,6 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command build/build-image/make-binaries.sh "$@" kube::build::run_build_command build/build-image/make-binaries.sh "$@"

View File

@ -25,5 +25,5 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image

View File

@ -20,10 +20,10 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
echo "+++ Cleaning out _output/build/*" echo "+++ Cleaning out _output/build/*"
kube::build::run-build-command rm -rf _output/build/* kube::build::run_build_command rm -rf _output/build/*
kube::build::clean-images kube::build::clean_images

View File

@ -23,6 +23,6 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command build/build-image/make-cross.sh kube::build::run_build_command build/build-image/make-cross.sh

View File

@ -23,8 +23,8 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command build/build-image/make-binaries.sh "$@" kube::build::run_build_command build/build-image/make-binaries.sh "$@"
kube::build::copy-output kube::build::copy_output
kube::build::run-image kube::build::run_image

View File

@ -22,13 +22,13 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command build/build-image/make-binaries.sh kube::build::run_build_command build/build-image/make-binaries.sh
kube::build::run-build-command build/build-image/make-cross.sh kube::build::run_build_command build/build-image/make-cross.sh
kube::build::run-build-command build/build-image/run-tests.sh kube::build::run_build_command build/build-image/run-tests.sh
kube::build::run-build-command build/build-image/run-integration.sh kube::build::run_build_command build/build-image/run-integration.sh
kube::build::copy-output kube::build::copy_output
kube::build::run-image kube::build::run_image
kube::build::package-tarballs kube::build::package_tarballs
kube::release::gcs::release kube::release::gcs::release

View File

@ -20,7 +20,7 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command build/build-image/make-binaries.sh "./cmd/integration" kube::build::run_build_command build/build-image/make-binaries.sh "./cmd/integration"
kube::build::run-build-command build/build-image/run-integration.sh kube::build::run_build_command build/build-image/run-integration.sh

View File

@ -20,6 +20,6 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command build/build-image/run-tests.sh "$@" kube::build::run_build_command build/build-image/run-tests.sh "$@"

View File

@ -22,6 +22,6 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
kube::build::verify-prereqs kube::build::verify_prereqs
kube::build::build-image kube::build::build_image
kube::build::run-build-command bash kube::build::run_build_command bash