From 3989ec66eba9a9da9ae85fb981ee776e4579ec41 Mon Sep 17 00:00:00 2001
From: yankaiz <yankaiz@google.com>
Date: Tue, 24 Apr 2018 17:50:07 -0700
Subject: [PATCH] Add MAX_PODS_PER_NODE env allowing kubelet to be max-pods
 aware.

---
 cluster/gce/config-default.sh | 2 ++
 cluster/gce/config-test.sh    | 2 ++
 cluster/gce/util.sh           | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index cefbdb7fe9..69516c1857 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -305,6 +305,8 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES"
   PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE"
   PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME"
+  # Number of Pods that can run on this node.
+  MAX_PODS_PER_NODE=${MAX_PODS_PER_NODE:-110}
 fi
 
 # Enable GCE Alpha features.
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index bad9917cd1..d11512ac32 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -312,6 +312,8 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES"
   PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE"
   PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME"
+  # Number of Pods that can run on this node.
+  MAX_PODS_PER_NODE=${MAX_PODS_PER_NODE:-110}
 fi
 
 # Enable GCE Alpha features.
diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 9d411206c2..87b1cbf196 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -677,6 +677,9 @@ function construct-kubelet-flags {
   if [[ -n "${CONTAINER_RUNTIME_ENDPOINT:-}" ]]; then
     flags+=" --container-runtime-endpoint=${CONTAINER_RUNTIME_ENDPOINT}"
   fi
+  if [[ -n "${MAX_PODS_PER_NODE:-}" ]]; then
+    flags+=" --max-pods=${MAX_PODS_PER_NODE}"
+  fi
 
   KUBELET_ARGS="${flags}"
 }
@@ -1136,6 +1139,11 @@ EOF
   if [ -n "${SCHEDULING_ALGORITHM_PROVIDER:-}" ]; then
     cat >>$file <<EOF
 SCHEDULING_ALGORITHM_PROVIDER: $(yaml-quote ${SCHEDULING_ALGORITHM_PROVIDER})
+EOF
+  fi
+  if [ -n "${MAX_PODS_PER_NODE:-}" ]; then
+    cat >>$file <<EOF
+MAX_PODS_PER_NODE: $(yaml-quote ${MAX_PODS_PER_NODE})
 EOF
   fi
 }