Switch tab indentation to two spaces.

This commit is contained in:
Madhusudan.C.S 2016-08-10 23:52:42 -07:00
parent fd03b9c43e
commit f3c82af6b6

View File

@ -71,122 +71,122 @@ KUBE_VERSION="${KUBE_VERSION:-}"
function cleanup { function cleanup {
rm -rf "${TMP_DIR}" rm -rf "${TMP_DIR}"
cd "${CUR_ROOT}" cd "${CUR_ROOT}"
} }
trap cleanup EXIT trap cleanup EXIT
function dirty_sha() { function dirty_sha() {
local -r index="${KUBE_ROOT}/.git/index" local -r index="${KUBE_ROOT}/.git/index"
local -r objects_dir="${KUBE_ROOT}/.git/objects" local -r objects_dir="${KUBE_ROOT}/.git/objects"
local -r tmp_dir="${TMP_DIR}/.git" local -r tmp_dir="${TMP_DIR}/.git"
local -r tmp_index="${tmp_dir}/index" local -r tmp_index="${tmp_dir}/index"
local -r tmp_objects_dir="${tmp_dir}/objects" local -r tmp_objects_dir="${tmp_dir}/objects"
mkdir -p "${tmp_objects_dir}" mkdir -p "${tmp_objects_dir}"
cp "${index}" "${tmp_index}" cp "${index}" "${tmp_index}"
local -r files=$(git ls-files -m -o -d --exclude-standard) local -r files=$(git ls-files -m -o -d --exclude-standard)
GIT_INDEX_FILE="${tmp_index}" git add ${files} GIT_INDEX_FILE="${tmp_index}" git add ${files}
GIT_ALTERNATE_OBJECT_DIRECTORIES="${objects_dir}" GIT_OBJECT_DIRECTORY="${tmp_objects_dir}" GIT_INDEX_FILE="${tmp_index}" git write-tree GIT_ALTERNATE_OBJECT_DIRECTORIES="${objects_dir}" GIT_OBJECT_DIRECTORY="${tmp_objects_dir}" GIT_INDEX_FILE="${tmp_index}" git write-tree
} }
function update_config() { function update_config() {
local -r q="${1:-}" local -r q="${1:-}"
local -r cfile="${2:-}" local -r cfile="${2:-}"
local -r bname="$(basename ${cfile})" local -r bname="$(basename ${cfile})"
jq "${q}" "${cfile}" > "${TMP_DIR}/${bname}" jq "${q}" "${cfile}" > "${TMP_DIR}/${bname}"
mv "${TMP_DIR}/${bname}" "${cfile}" mv "${TMP_DIR}/${bname}" "${cfile}"
} }
function build() { function build() {
kube::build::verify_prereqs kube::build::verify_prereqs
kube::build::build_image kube::build::build_image
kube::build::run_build_command make WHAT="cmd/kubectl cmd/hyperkube" kube::build::run_build_command make WHAT="cmd/kubectl cmd/hyperkube"
# Recompute KUBE_VERSION because it might have changed after rebuild. # Recompute KUBE_VERSION because it might have changed after rebuild.
KUBE_VERSION="${KUBE_VERSION:-$(kube::release::semantic_image_tag_version)}" KUBE_VERSION="${KUBE_VERSION:-$(kube::release::semantic_image_tag_version)}"
# Also append the dirty tree SHA to keep the versions unique across # Also append the dirty tree SHA to keep the versions unique across
# builds. # builds.
if [[ "${KUBE_VERSION}" == *-dirty ]]; then if [[ "${KUBE_VERSION}" == *-dirty ]]; then
KUBE_VERSION+=".$(dirty_sha)" KUBE_VERSION+=".$(dirty_sha)"
fi fi
BASEIMAGE="ubuntu:16.04" \ BASEIMAGE="ubuntu:16.04" \
REGISTRY="${KUBE_REGISTRY}" \ REGISTRY="${KUBE_REGISTRY}" \
VERSION="${KUBE_VERSION}" \ VERSION="${KUBE_VERSION}" \
make -C "${KUBE_ROOT}/cluster/images/hyperkube" build make -C "${KUBE_ROOT}/cluster/images/hyperkube" build
} }
function push() { function push() {
kube::log::status "Pushing hyperkube image to the registry" kube::log::status "Pushing hyperkube image to the registry"
gcloud docker push "${KUBE_REGISTRY}/hyperkube-amd64:${KUBE_VERSION}" gcloud docker push "${KUBE_REGISTRY}/hyperkube-amd64:${KUBE_VERSION}"
} }
function pull_installer() { function pull_installer() {
kube::log::status "Pulling installer images" kube::log::status "Pulling installer images"
docker pull "${KUBE_ANYWHERE_FEDERATION_IMAGE}:${KUBE_ANYWHERE_FEDERATION_VERSION}" docker pull "${KUBE_ANYWHERE_FEDERATION_IMAGE}:${KUBE_ANYWHERE_FEDERATION_VERSION}"
docker pull "${KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE}:${KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION}" docker pull "${KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE}:${KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION}"
} }
function ensure_files() { function ensure_files() {
kube::log::status "Ensure provider is supported..." kube::log::status "Ensure provider is supported..."
if [[ "${KUBERNETES_PROVIDER:-}" != "gce" ]]; then if [[ "${KUBERNETES_PROVIDER:-}" != "gce" ]]; then
echo "Supported providers: \"gce\"" echo "Supported providers: \"gce\""
exit 1 exit 1
fi fi
kube::log::status "Ensure credential files exist..." kube::log::status "Ensure credential files exist..."
if [[ ! -f "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then if [[ ! -f "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then
echo "Please ensure Google credentials file \""${GOOGLE_APPLICATION_CREDENTIALS}"\" exists." echo "Please ensure Google credentials file \""${GOOGLE_APPLICATION_CREDENTIALS}"\" exists."
exit 1 exit 1
fi fi
if [[ ! -f "${KUBE_CONFIG}" ]]; then if [[ ! -f "${KUBE_CONFIG}" ]]; then
echo "Please ensure kubeconfig file \""${KUBE_CONFIG}"\" exists." echo "Please ensure kubeconfig file \""${KUBE_CONFIG}"\" exists."
exit 1 exit 1
fi fi
} }
function kube_action() { function kube_action() {
kube::log::status "${ACTION} clusters" kube::log::status "${ACTION} clusters"
docker run \ docker run \
--user="$(id -u):$(id -g)" \ --user="$(id -u):$(id -g)" \
-m 12G \ -m 12G \
-v "${GOOGLE_APPLICATION_CREDENTIALS}:/.config/gcloud/application_default_credentials.json:ro" \ -v "${GOOGLE_APPLICATION_CREDENTIALS}:/.config/gcloud/application_default_credentials.json:ro" \
-v "${KUBE_CONFIG_DIR}:/.kube" \ -v "${KUBE_CONFIG_DIR}:/.kube" \
-v "${FEDERATION_OUTPUT_ROOT}:/_output" \ -v "${FEDERATION_OUTPUT_ROOT}:/_output" \
"${KUBE_ANYWHERE_FEDERATION_IMAGE}:${KUBE_ANYWHERE_FEDERATION_VERSION}" \ "${KUBE_ANYWHERE_FEDERATION_IMAGE}:${KUBE_ANYWHERE_FEDERATION_VERSION}" \
"${ACTION}" "${ACTION}"
} }
function federation_action() { function federation_action() {
kube::log::status "${ACTION} federation components" kube::log::status "${ACTION} federation components"
docker run \ docker run \
-m 12G \ -m 12G \
-v "${KUBE_CONFIG}:/root/.kube/config:ro" \ -v "${KUBE_CONFIG}:/root/.kube/config:ro" \
-v "${FEDERATION_OUTPUT_ROOT}:/_output" \ -v "${FEDERATION_OUTPUT_ROOT}:/_output" \
"${KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE}:${KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION}" \ "${KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE}:${KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION}" \
"${ACTION}" "${ACTION}"
} }
function gen_or_update_config() { function gen_or_update_config() {
mkdir -p "${FEDERATION_OUTPUT_ROOT}" mkdir -p "${FEDERATION_OUTPUT_ROOT}"
cp "federation/config.default.json" "${FEDERATION_OUTPUT_ROOT}/config.json" cp "federation/config.default.json" "${FEDERATION_OUTPUT_ROOT}/config.json"
update_config \ update_config \
'[.[] | .phase1.gce.project |= "'"${KUBE_PROJECT}"'"]' \ '[.[] | .phase1.gce.project |= "'"${KUBE_PROJECT}"'"]' \
"${FEDERATION_OUTPUT_ROOT}/config.json" "${FEDERATION_OUTPUT_ROOT}/config.json"
# Not chaining for readability # Not chaining for readability
update_config \ update_config \
'[.[] | .phase2 = { docker_registry: "'"${KUBE_REGISTRY}"'", kubernetes_version: "'"${KUBE_VERSION}"'" } ]' \ '[.[] | .phase2 = { docker_registry: "'"${KUBE_REGISTRY}"'", kubernetes_version: "'"${KUBE_VERSION}"'" } ]' \
"${FEDERATION_OUTPUT_ROOT}/config.json" "${FEDERATION_OUTPUT_ROOT}/config.json"
cat <<EOF> "${FEDERATION_OUTPUT_ROOT}/values.yaml" cat <<EOF> "${FEDERATION_OUTPUT_ROOT}/values.yaml"
apiserverRegistry: "${KUBE_REGISTRY}" apiserverRegistry: "${KUBE_REGISTRY}"
apiserverVersion: "${KUBE_VERSION}" apiserverVersion: "${KUBE_VERSION}"
controllerManagerRegistry: "${KUBE_REGISTRY}" controllerManagerRegistry: "${KUBE_REGISTRY}"
@ -195,23 +195,23 @@ EOF
} }
if [[ "${ACTION}" == "gen" || "${ACTION}" == "deploy" ]]; then if [[ "${ACTION}" == "gen" || "${ACTION}" == "deploy" ]]; then
ensure_files ensure_files
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
build build
push push
pull_installer pull_installer
# Update config after build and push, but before turning up the clusters # Update config after build and push, but before turning up the clusters
# to ensure the config has the right image version tags. # to ensure the config has the right image version tags.
gen_or_update_config gen_or_update_config
kube_action kube_action
federation_action federation_action
else else
federation_action federation_action
kube_action kube_action
fi fi
kube::log::status "Successfully completed!" kube::log::status "Successfully completed!"