Disable kubelet disk eviction by default

pull/3671/head
Thomas Stromberg 2019-02-13 15:08:06 -08:00
parent 8f3c88d83d
commit caafc66a61
1 changed files with 18 additions and 6 deletions

View File

@ -47,10 +47,12 @@ nodeName: {{.NodeName}}
var kubeadmConfigTemplateV1Alpha3 = template.Must(template.New("kubeadmConfigTemplate-v1alpha3").Funcs(template.FuncMap{ var kubeadmConfigTemplateV1Alpha3 = template.Must(template.New("kubeadmConfigTemplate-v1alpha3").Funcs(template.FuncMap{
"printMapInOrder": printMapInOrder, "printMapInOrder": printMapInOrder,
}).Parse(`apiEndpoint: }).Parse(`
apiVersion: kubeadm.k8s.io/v1alpha3
kind: InitConfiguration
apiEndpoint:
advertiseAddress: {{.AdvertiseAddress}} advertiseAddress: {{.AdvertiseAddress}}
bindPort: {{.APIServerPort}} bindPort: {{.APIServerPort}}
apiVersion: kubeadm.k8s.io/v1alpha3
bootstrapTokens: bootstrapTokens:
- groups: - groups:
- system:bootstrappers:kubeadm:default-node-token - system:bootstrappers:kubeadm:default-node-token
@ -58,30 +60,40 @@ bootstrapTokens:
usages: usages:
- signing - signing
- authentication - authentication
kind: InitConfiguration
nodeRegistration: nodeRegistration:
criSocket: {{if .CRISocket}}{{.CRISocket}}{{else}}/var/run/dockershim.sock{{end}} criSocket: {{if .CRISocket}}{{.CRISocket}}{{else}}/var/run/dockershim.sock{{end}}
name: {{.NodeName}} name: {{.NodeName}}
taints: [] taints: []
--- ---
apiVersion: kubeadm.k8s.io/v1alpha3
kind: ClusterConfiguration
{{range .ExtraArgs}}{{.Component}}:{{range $i, $val := printMapInOrder .Options ": " }} {{range .ExtraArgs}}{{.Component}}:{{range $i, $val := printMapInOrder .Options ": " }}
{{$val}}{{end}} {{$val}}{{end}}
{{end}}{{if .FeatureArgs}}featureGates: {{range $i, $val := .FeatureArgs}} {{end}}{{if .FeatureArgs}}featureGates: {{range $i, $val := .FeatureArgs}}
{{$i}}: {{$val}}{{end}} {{$i}}: {{$val}}{{end}}
{{end}} {{end}}
apiVersion: kubeadm.k8s.io/v1alpha3
certificatesDir: {{.CertDir}} certificatesDir: {{.CertDir}}
clusterName: kubernetes clusterName: kubernetes
controlPlaneEndpoint: localhost:{{.APIServerPort}} controlPlaneEndpoint: localhost:{{.APIServerPort}}
etcd: etcd:
local: local:
dataDir: {{.EtcdDataDir}} dataDir: {{.EtcdDataDir}}
kind: ClusterConfiguration
kubernetesVersion: {{.KubernetesVersion}} kubernetesVersion: {{.KubernetesVersion}}
networking: networking:
dnsDomain: cluster.local dnsDomain: cluster.local
podSubnet: "" podSubnet: ""
serviceSubnet: {{.ServiceCIDR}}`)) serviceSubnet: {{.ServiceCIDR}}
---
apiVersion: kubelet.config.k8s.io/v1beta1
kind: KubeletConfiguration
# disable disk resource management by default, as it doesn't work well within the minikube environment.
imageGCHighThresholdPercent: 100
# Don't evict jobs, as we only have a single node to run on.
evictionHard:
nodefs.available: "0%"
nodefs.inodesFree: "0%"
imagefs.available: "0%"
`))
var kubeletSystemdTemplate = template.Must(template.New("kubeletSystemdTemplate").Parse(` var kubeletSystemdTemplate = template.Must(template.New("kubeletSystemdTemplate").Parse(`
[Unit] [Unit]