github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-25 12:17:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26828 from vishh/oom-kill-enable

Browse Source 
Automatic merge from submit-queue

Enable support for memory eviction configuration via salt

Added evictions based on memory by default whenever the available memory is < 100Mi.

Updated GCE and GCI.
This commit is contained in:
k8s-merge-robot
2016-06-07 21:12:50 -07:00
parent bae931204c 7e731dac60
commit a283a0a759
8 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/config-default.sh
View File

@@ -138,3 +138,6 @@ OPENCONTRAIL_PUBLIC_SUBNET="${OPENCONTRAIL_PUBLIC_SUBNET:-10.1.0.0/16}"
HAIRPIN_MODE="${HAIRPIN_MODE:-promiscuous-bridge}" # promiscuous-bridge, hairpin-veth, none
# Optional: if set to true, kube-up will configure the cluster to run e2e tests.
E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}
# Evict pods whenever compute resource availability on the nodes gets below a threshold.
EVICTION_HARD="${EVICTION_HARD:-memory.available<100Mi}"