Commit 3989ec66 authored by yankaiz's avatar yankaiz

Add MAX_PODS_PER_NODE env allowing kubelet to be max-pods aware.

parent 484f62a5
...@@ -305,6 +305,8 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then ...@@ -305,6 +305,8 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES"
PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE"
PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" 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 fi
# Enable GCE Alpha features. # Enable GCE Alpha features.
......
...@@ -312,6 +312,8 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then ...@@ -312,6 +312,8 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES" PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES"
PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE" PROVIDER_VARS="${PROVIDER_VARS:-} NODE_IPAM_MODE"
PROVIDER_VARS="${PROVIDER_VARS:-} SECONDARY_RANGE_NAME" 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 fi
# Enable GCE Alpha features. # Enable GCE Alpha features.
......
...@@ -677,6 +677,9 @@ function construct-kubelet-flags { ...@@ -677,6 +677,9 @@ function construct-kubelet-flags {
if [[ -n "${CONTAINER_RUNTIME_ENDPOINT:-}" ]]; then if [[ -n "${CONTAINER_RUNTIME_ENDPOINT:-}" ]]; then
flags+=" --container-runtime-endpoint=${CONTAINER_RUNTIME_ENDPOINT}" flags+=" --container-runtime-endpoint=${CONTAINER_RUNTIME_ENDPOINT}"
fi fi
if [[ -n "${MAX_PODS_PER_NODE:-}" ]]; then
flags+=" --max-pods=${MAX_PODS_PER_NODE}"
fi
KUBELET_ARGS="${flags}" KUBELET_ARGS="${flags}"
} }
...@@ -1138,6 +1141,11 @@ EOF ...@@ -1138,6 +1141,11 @@ EOF
SCHEDULING_ALGORITHM_PROVIDER: $(yaml-quote ${SCHEDULING_ALGORITHM_PROVIDER}) SCHEDULING_ALGORITHM_PROVIDER: $(yaml-quote ${SCHEDULING_ALGORITHM_PROVIDER})
EOF EOF
fi fi
if [ -n "${MAX_PODS_PER_NODE:-}" ]; then
cat >>$file <<EOF
MAX_PODS_PER_NODE: $(yaml-quote ${MAX_PODS_PER_NODE})
EOF
fi
} }
function sha1sum-file() { function sha1sum-file() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment