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

[Federation] Remove unnecessary functions from develop.sh as part of deploy.sh deprecation.

Browse Source 
This is part of a big refactor to deprecate a short-lived deploy.sh
mechanism that nobody really could use due to bugs.
This commit is contained in:
Madhusudan.C.S 2016-12-16 13:19:14 -08:00
parent e3c6ab1c8f
commit 5d8885dc72
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
federation/develop/develop.sh
View File

@ -74,15 +74,6 @@ function dirty_sha() {
GIT_ALTERNATE_OBJECT_DIRECTORIES="${objects_dir}" GIT_OBJECT_DIRECTORY="${tmp_objects_dir}" GIT_INDEX_FILE="${tmp_index}" git write-tree
}
function update_config() {
local -r q="${1:-}"
local -r cfile="${2:-}"
local -r bname="$(basename ${cfile})"
jq "${q}" "${cfile}" > "${TMP_DIR}/${bname}"
mv "${TMP_DIR}/${bname}" "${cfile}"
}
function build_binaries() {
cd "${KUBE_ROOT}"
kube::build::verify_prereqs
@ -107,8 +98,9 @@ function build_image() {
# Write the generated version to the output versions file so that we can
# reuse it.
mkdir -p "${FEDERATION_OUTPUT_ROOT}"
jq -n --arg ver "${kube_version}" \
'{"KUBE_VERSION": $ver}' > "${VERSIONS_FILE}"
echo "{
\"KUBE_VERSION\": \"${kube_version}\"
}" > "${VERSIONS_FILE}"
kube::log::status "Wrote to version file ${VERSIONS_FILE}: ${kube_version}"
BASEIMAGE="ubuntu:16.04" \
@ -123,7 +115,9 @@ function get_version() {
kube_version="${KUBE_VERSION}"
else
# Read the version back from the versions file if no version is given.
kube_version="$(jq -r '.KUBE_VERSION' ${VERSIONS_FILE})"
kube_version="$(cat ${VERSIONS_FILE} | python -c '\
import json, sys;\
print json.load(sys.stdin)["KUBE_VERSION"]')"
fi
echo "${kube_version}"
}
@ -133,33 +127,6 @@ function push() {
kube::log::status "Pushing hyperkube image to the registry"
gcloud docker -- push "${KUBE_REGISTRY}/hyperkube-amd64:${kube_version}"
# Update config after build and push, but before turning up the clusters
# to ensure the config has the right image version tags.
gen_or_update_config "${kube_version}"
}
function gen_or_update_config() {
local -r kube_version="${1:-}"
mkdir -p "${FEDERATION_OUTPUT_ROOT}"
cp "${DEPLOY_ROOT}/config.json.sample" "${FEDERATION_OUTPUT_ROOT}/config.json"
update_config \
'[.[] | .phase1.gce.project |= "'"${KUBE_PROJECT}"'"]' \
"${FEDERATION_OUTPUT_ROOT}/config.json"
# Not chaining for readability
update_config \
'[.[] | .phase2 = { docker_registry: "'"${KUBE_REGISTRY}"'", kubernetes_version: "'"${kube_version}"'" } ]' \
"${FEDERATION_OUTPUT_ROOT}/config.json"
cat <<EOF> "${FEDERATION_OUTPUT_ROOT}/values.yaml"
apiserverRegistry: "${KUBE_REGISTRY}"
apiserverVersion: "${kube_version}"
controllerManagerRegistry: "${KUBE_REGISTRY}"
controllerManagerVersion: "${kube_version}"
EOF
}
readonly ACTION="${1:-}"