Skip to content

Make eviction and image GC settings consistent across kubeadm API versions #7364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Apr 2, 2020
Merged

Make eviction and image GC settings consistent across kubeadm API versions #7364

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7af6adf
adjust eviction hard and soft for both v1beta1 and v1beta2
medyagh Apr 1, 2020
2e19e99
remove duplicate paste
medyagh Apr 1, 2020
0f3b1d5
lowercase
medyagh Apr 1, 2020
44e7338
fix some unit tests
medyagh Apr 1, 2020
8350674
fix v12 tests
medyagh Apr 1, 2020
6af355c
fix unit test for v1.13
medyagh Apr 1, 2020
5505ad8
fix v.1.14 unit tst
medyagh Apr 1, 2020
d4853b0
fix v1.15 unit tests
medyagh Apr 1, 2020
84d469a
fix unit test _v1.16
medyagh Apr 1, 2020
2af012f
fix v1.17 unit test
medyagh Apr 1, 2020
8bcda5c
fix v1.18 unit test
medyagh Apr 1, 2020
72cc9cb
fix v1.19 unit test
medyagh Apr 1, 2020
071b2c1
disable disk resource management by default
medyagh Apr 2, 2020
9b21762
get rid of evicition soft
medyagh Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,17 @@ networking:
---
apiVersion: kubelet.config.k8s.io/v1beta1
kind: KubeletConfiguration
imageGCHighThresholdPercent: 100
imageGCHighThresholdPercent: 70
evictionSoft:
memory.available: "300mb"
nodefs.available: "30%"
nodefs.inodesFree: "20%"
imagefs.available: "30%"
evictionHard:
nodefs.available: "0%"
nodefs.inodesFree: "0%"
imagefs.available: "0%"
memory.available: "100mb"
nodefs.available: "10%"
nodefs.inodesFree: "5%"
imagefs.available: "10%"
---
apiVersion: kubeproxy.config.k8s.io/v1alpha1
kind: KubeProxyConfiguration
Expand Down
20 changes: 19 additions & 1 deletion pkg/minikube/bootstrapper/bsutil/ktmpl/v1beta2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,22 @@ networking:
dnsDomain: {{if .DNSDomain}}{{.DNSDomain}}{{else}}cluster.local{{end}}
podSubnet: "{{.PodSubnet }}"
serviceSubnet: {{.ServiceCIDR}}
`))
---
apiVersion: kubelet.config.k8s.io/v1beta1
kind: KubeletConfiguration
imageGCHighThresholdPercent: 70
evictionSoft:
memory.available: "300mb"
nodefs.available: "30%"
nodefs.inodesFree: "20%"
imagefs.available: "30%"
evictionHard:
memory.available: "100mb"
nodefs.available: "10%"
nodefs.inodesFree: "5%"
imagefs.available: "10%"
---
apiVersion: kubeproxy.config.k8s.io/v1alpha1
kind: KubeProxyConfiguration
metricsBindAddress: {{.AdvertiseAddress}}:10249
`))