Merge pull request #52959 from…

Merge pull request #52959 from mattjmcnaughton/mattjmcnaughton/dynamically-determine-default-docker-machine-memory Automatic merge from submit-queue (batch tested with PRs 52959, 53790). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Dynamically determine default docker machine memory **What this PR does / why we need it**: Currently, if using `docker-machine` for k8s docker operations on a Mac, we'll create a VM with 4096MB of memory. The machine's RAM will be the same regardless of the memory available on the local machine. For example, if the user has 16GB on their local machine, the VM will still only have 4GB of RAM. Update the method for defining the `kube-dev` VM with `docker-machine`, so we give it access to 50% of the total RAM. **Release note**: ```release-note NONE ```

Merge pull request #52959 from…
2e6ccc3f · Kubernetes Submit Queue · GitHub · 018c0832 · abee38cb · 2e6ccc3f
Commit 2e6ccc3f authored Oct 13, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

common.sh build/common.sh +14 -2

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -26,7 +26,7 @@ DOCKER_OPTS=${DOCKER_OPTS:-""}
 DOCKER=(docker ${DOCKER_OPTS})
 DOCKER_HOST=${DOCKER_HOST:-""}
 DOCKER_MACHINE_NAME=${DOCKER_MACHINE_NAME:-"kube-dev"}
-readonly DOCKER_MACHINE_DRIVER=${DOCKER_MACHINE_DRIVER:-"virtualbox --virtualbox-memory 4096 --virtualbox-cpu-count -1"}
+readonly DOCKER_MACHINE_DRIVER=${DOCKER_MACHINE_DRIVER:-"virtualbox --virtualbox-cpu-count -1"}
 # This will canonicalize the path
 KUBE_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd -P)
@@ -219,16 +219,28 @@ function kube::build::docker_available_on_osx() {
 function kube::build::prepare_docker_machine() {
  kube::log::status "docker-machine was found."
+  local available_memory_bytes=$(sysctl -n hw.memsize 2>/dev/null)
+  local bytes_in_mb=1048576
+  # Give virtualbox 1/2 the system memory. Its necessary to divide by 2, instead
+  # of multiple by .5, because bash can only multiply by ints.
+  local memory_divisor=2
+  local virtualbox_memory_mb=$(( ${available_memory_bytes} / (${bytes_in_mb} * ${memory_divisor}) ))
  docker-machine inspect "${DOCKER_MACHINE_NAME}" &> /dev/null || {
    kube::log::status "Creating a machine to build Kubernetes"
    docker-machine create --driver ${DOCKER_MACHINE_DRIVER} \
+      --virtualbox-memory "${virtualbox_memory_mb}" \
      --engine-env HTTP_PROXY="${KUBERNETES_HTTP_PROXY:-}" \
      --engine-env HTTPS_PROXY="${KUBERNETES_HTTPS_PROXY:-}" \
      --engine-env NO_PROXY="${KUBERNETES_NO_PROXY:-127.0.0.1}" \
      "${DOCKER_MACHINE_NAME}" > /dev/null || {
      kube::log::error "Something went wrong creating a machine."
      kube::log::error "Try the following: "
-      kube::log::error "docker-machine create -d ${DOCKER_MACHINE_DRIVER} ${DOCKER_MACHINE_NAME}"
+      kube::log::error "docker-machine create -d ${DOCKER_MACHINE_DRIVER} --virtualbox-memory ${virtualbox_memory_mb} ${DOCKER_MACHINE_NAME}"
      return 1
    }
  }