diff --git a/charts/kubeadm/templates/KubeletConfiguration.yaml b/charts/kubeadm/templates/KubeletConfiguration.yaml index 0843c926..eee7285e 100644 --- a/charts/kubeadm/templates/KubeletConfiguration.yaml +++ b/charts/kubeadm/templates/KubeletConfiguration.yaml @@ -6,6 +6,7 @@ cgroupDriver: cgroupfs logging: format: json hairpinMode: hairpin-veth +ContainerRuntimeEndpoint: "unix:///var/run/crio/crio.sock" {{- if .Values.systemd }} resolvConf: /run/systemd/resolve/resolv.conf {{- end }} @@ -32,6 +33,5 @@ kubeReserved: #evictionHard: # memory.available: "484Mi" imageGCLowThresholdPercent: 70 -# kernelMemcgNotification: true serializeImagePulls: false -maxParallelImagePulls: 2 +maxParallelImagePulls: 4 diff --git a/charts/kubeadm/templates/_helpers.tpl b/charts/kubeadm/templates/_helpers.tpl index f78c39f5..094346c0 100644 --- a/charts/kubeadm/templates/_helpers.tpl +++ b/charts/kubeadm/templates/_helpers.tpl @@ -1,7 +1,9 @@ {{- /* Feature gates for all control plane components */ -}} {{- /* ToAdd: "PodAndContainerStatsFromCRI" */ -}} +{{- /* Issues: "MemoryQoS" */ -}} +{{- /* v1.28: "NodeSwap" */ -}} {{- define "kubeadm.featuregates" }} -{{- $gates := list "CustomCPUCFSQuotaPeriod" "MemoryQoS" }} +{{- $gates := list "CustomCPUCFSQuotaPeriod" }} {{- if eq .return "csv" }} {{- range $key := $gates }} {{- $key }}=true, diff --git a/docs/v1.27.md b/docs/v1.27.md index 9b827cee..49d3d02e 100644 --- a/docs/v1.27.md +++ b/docs/v1.27.md @@ -20,7 +20,6 @@ ### FeatureGates - CustomCPUCFSQuotaPeriod -- [MemoryQoS](https://kubernetes.io/blog/2023/05/05/qos-memory-resources/) # Upgrade `(No, really, you MUST read this before you upgrade)`