Skip to content

K
k3s
Commit 5504c58c authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28607 from derekwaynecarr/default_eviction

Automatic merge from submit-queue Enable memory eviction by default ```release-note Enable memory based pod evictions by default on the kubelet. Trigger pod eviction when available memory falls below 100Mi. ``` See: https://github.com/kubernetes/kubernetes/issues/28552 /cc @kubernetes/rh-cluster-infra @kubernetes/sig-node
parents 913d785b 4e6a52d8
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
cmd/kubelet/app/options/options.go
View file @ 5504c58c
...@@ -151,6 +151,7 @@ func NewKubeletServer() *KubeletServer { ...@@ -151,6 +151,7 @@ func NewKubeletServer() *KubeletServer {
OutOfDiskTransitionFrequency: unversioned.Duration{Duration: 5 * time.Minute}, OutOfDiskTransitionFrequency: unversioned.Duration{Duration: 5 * time.Minute},
HairpinMode: componentconfig.PromiscuousBridge, HairpinMode: componentconfig.PromiscuousBridge,
BabysitDaemons: false, BabysitDaemons: false,
EvictionHard: "memory.available<100Mi",
EvictionPressureTransitionPeriod: unversioned.Duration{Duration: 5 * time.Minute}, EvictionPressureTransitionPeriod: unversioned.Duration{Duration: 5 * time.Minute},
PodsPerCore: 0, PodsPerCore: 0,
}, },
......
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