github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44902 from kubernetes/revert-43181-fed-build-hyperkube-img

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 44853, 44572, 44797, 44439, 44902)

Revert "[Federation] Build a simple hyperkube image on-the-fly only containing the hyperkube binary for development and testing purposes."

Reverts kubernetes/kubernetes#43181

Federation CI and PR tests are completely broken. No time to root cause this, but the merge time of PR #43181 and failures match. So we are going to try by reverting this.
This commit is contained in:
Kubernetes Submit Queue
2017-04-25 02:04:38 -07:00
committed by GitHub
parent d86a01570b ffc28cc821
commit 3e05c8f87f
1 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
federation/develop/develop.sh
View File

@@ -43,9 +43,6 @@ readonly TMP_DIR="$(mktemp -d)"
readonly FEDERATION_OUTPUT_ROOT="${LOCAL_OUTPUT_ROOT}/federation" readonly FEDERATION_OUTPUT_ROOT="${LOCAL_OUTPUT_ROOT}/federation"
readonly VERSIONS_FILE="${FEDERATION_OUTPUT_ROOT}/versions" readonly VERSIONS_FILE="${FEDERATION_OUTPUT_ROOT}/versions"
readonly KUBE_PLATFORM=${KUBE_PLATFORM:-linux}
readonly KUBE_ARCH=${KUBE_ARCH:-amd64}
if [[ "${KUBERNETES_PROVIDER}" == "gke" || "${KUBERNETES_PROVIDER}" == "gce" ]]; then if [[ "${KUBERNETES_PROVIDER}" == "gke" || "${KUBERNETES_PROVIDER}" == "gce" ]]; then
detect-project detect-project
readonly KUBE_PROJECT="${KUBE_PROJECT:-${PROJECT:-}}" readonly KUBE_PROJECT="${KUBE_PROJECT:-${PROJECT:-}}"
@@ -70,7 +67,7 @@ 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/.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"
@@ -86,7 +83,7 @@ function build_binaries() {
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
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 federation/cmd/kubefed" kube::build::run_build_command make WHAT="cmd/kubectl cmd/hyperkube"
kube::build::copy_output kube::build::copy_output
} }
@@ -112,35 +109,10 @@ function build_image() {
}" > "${VERSIONS_FILE}" }" > "${VERSIONS_FILE}"
kube::log::status "Wrote to version file ${VERSIONS_FILE}: ${kube_version}" kube::log::status "Wrote to version file ${VERSIONS_FILE}: ${kube_version}"
local -r binary="hyperkube" BASEIMAGE="ubuntu:16.04" \
local -r image="hyperkube-amd64" REGISTRY="${KUBE_REGISTRY}" \
local -r bin_path="${LOCAL_OUTPUT_BINPATH}/${KUBE_PLATFORM}/${KUBE_ARCH}/hyperkube" VERSION="${kube_version}" \
make -C "${KUBE_ROOT}/cluster/images/hyperkube" build
if [[ ! -f "${bin_path}" ]]; then
echo "${bin_path} does not exist"
exit 1
fi
local docker_build_path="${TMP_DIR}/dockerbuild"
local docker_file_path="${docker_build_path}/Dockerfile"
rm -rf ${docker_build_path}
mkdir -p ${docker_build_path}
cp "${bin_path}" "${docker_build_path}/${binary}"
printf " FROM ubuntu:16.04 \n ADD ${binary} /${binary}\n" > ${docker_file_path}
local docker_image_tag="${KUBE_REGISTRY}:${kube_version}"
# Build the docker image on-the-fly.
#
# NOTE: This is only a temporary fix until the proposal in issue
# https://github.com/kubernetes/kubernetes/issues/28630 is implemented.
# Also, the new turn up mechanism completely obviates this step.
kube::log::status "Building docker image ${docker_image_tag} from the binary"
docker build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
rm -rf ${docker_build_path}
} }
function get_version() { function get_version() {