Merge pull request kubernetes#83454 from dims/cleanup-hyperkube-from-release-artifacts

Remove hyperkube from release artifacts

Author: k8s-ci-robot

build/BUILD

@@ -135,7 +135,6 @@ release_filegroup(
     name = "server-targets",
     conditioned_srcs = for_platforms(for_server = [
         "//cluster/gce/gci/mounter",
-        "//cmd/hyperkube",
         "//cmd/kube-apiserver",
         "//cmd/kube-controller-manager",
         "//cmd/kube-scheduler",

build/lib/release.sh

@@ -28,7 +28,6 @@ readonly RELEASE_STAGE="${LOCAL_OUTPUT_ROOT}/release-stage"
 readonly RELEASE_TARS="${LOCAL_OUTPUT_ROOT}/release-tars"
 readonly RELEASE_IMAGES="${LOCAL_OUTPUT_ROOT}/release-images"
 
-KUBE_BUILD_HYPERKUBE=${KUBE_BUILD_HYPERKUBE:-y}
 KUBE_BUILD_CONFORMANCE=${KUBE_BUILD_CONFORMANCE:-y}
 KUBE_BUILD_PULL_LATEST_IMAGES=${KUBE_BUILD_PULL_LATEST_IMAGES:-y}
 
@@ -218,11 +217,6 @@ function kube::release::build_server_images() {
     cp "${KUBE_SERVER_IMAGE_BINARIES[@]/#/${LOCAL_OUTPUT_BINPATH}/${platform}/}" \
       "${release_stage}/server/bin/"
 
-    # if we are building hyperkube, we also need to copy that binary
-    if [[ "${KUBE_BUILD_HYPERKUBE}" =~ [yY] ]]; then
-      cp "${LOCAL_OUTPUT_BINPATH}/${platform}/hyperkube" "${release_stage}/server/bin"
-    fi
-
     kube::release::create_docker_images_for_server "${release_stage}/server/bin" "${arch}"
   done
 }
@@ -284,23 +278,6 @@ function kube::release::sha1() {
   fi
 }
 
-function kube::release::build_hyperkube_image() {
-  local -r arch="$1"
-  local -r registry="$2"
-  local -r version="$3"
-  local -r save_dir="${4-}"
-  kube::log::status "Building hyperkube image for arch: ${arch}"
-  ARCH="${arch}" REGISTRY="${registry}" VERSION="${version}" \
-    make -C cluster/images/hyperkube/ build >/dev/null
-
-  local hyperkube_tag="${registry}/hyperkube-${arch}:${version}"
-  if [[ -n "${save_dir}" ]]; then
-    "${DOCKER[@]}" save "${hyperkube_tag}" > "${save_dir}/hyperkube-${arch}.tar"
-  fi
-  kube::log::status "Deleting hyperkube image ${hyperkube_tag}"
-  "${DOCKER[@]}" rmi "${hyperkube_tag}" &>/dev/null || true
-}
-
 function kube::release::build_conformance_image() {
   local -r arch="$1"
   local -r registry="$2"
@@ -398,10 +375,6 @@ EOF
       ) &
     done
 
-    if [[ "${KUBE_BUILD_HYPERKUBE}" =~ [yY] ]]; then
-      kube::release::build_hyperkube_image "${arch}" "${docker_registry}" \
-        "${docker_tag}" "${images_dir}" &
-    fi
     if [[ "${KUBE_BUILD_CONFORMANCE}" =~ [yY] ]]; then
       kube::release::build_conformance_image "${arch}" "${docker_registry}" \
         "${docker_tag}" "${images_dir}" &

build/release-images.sh

@@ -26,9 +26,6 @@ source "${KUBE_ROOT}/build/common.sh"
 source "${KUBE_ROOT}/build/lib/release.sh"
 
 CMD_TARGETS="${KUBE_SERVER_IMAGE_TARGETS[*]}"
-if [[ "${KUBE_BUILD_HYPERKUBE}" =~ [yY] ]]; then
-    CMD_TARGETS="${CMD_TARGETS} cmd/hyperkube"
-fi
 if [[ "${KUBE_BUILD_CONFORMANCE}" =~ [yY] ]]; then
     CMD_TARGETS="${CMD_TARGETS} ${KUBE_CONFORMANCE_IMAGE_TARGETS[*]}"
 fi

build/root/BUILD.root

@@ -35,7 +35,6 @@ filegroup(
 # TODO: collect all relevant docker_push targets into one target that can be run:
 #   //build:push-server-images
 #   //cluster/images/conformance:push-conformance
-#   //cluster/images/hyperkube:push-hyperkube
 gcs_upload(
     name = "push-build",
     data = [

build/root/Makefile

@@ -426,7 +426,6 @@ define RELEASE_IMAGES_HELP_INFO
 # Build release images
 #
 # Args:
-#   KUBE_BUILD_HYPERKUBE: Whether to build hyperkube image as well. Set to 'n' to skip.
 #   KUBE_BUILD_CONFORMANCE: Whether to build conformance testing image as well. Set to 'n' to skip.
 #
 # Example:
@@ -470,7 +469,6 @@ define QUICK_RELEASE_IMAGES_HELP_INFO
 #
 # Args:
 #   KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so.
-#   KUBE_BUILD_HYPERKUBE: Whether to build hyperkube image as well. Set to 'n' to skip.
 #   KUBE_BUILD_CONFORMANCE: Whether to build conformance testing image as well. Set to 'n' to skip.
 #
 # Example:

build/visible_to/BUILD

@@ -98,7 +98,6 @@ package_group(
     name = "pkg_kubectl_cmd_CONSUMERS_BAD",
     packages = [
         "//cmd/clicheck",
-        "//cmd/hyperkube",
     ],
 )
 

cluster/get-kube-local.sh

@@ -73,7 +73,6 @@ kube::golang::server_targets() {
     cmd/kube-controller-manager
     cmd/kubelet
     cmd/kubeadm
-    cmd/hyperkube
     cmd/kube-scheduler
     vendor/k8s.io/apiextensions-apiserver
     cluster/gce/gci/mounter