Skip to content
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

WINC-1374,WINC-926,WINC-1373: Adjust kubelet configuration for NodeAllocatable, EvictionHard and System Memory #2709

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

WINC-1374,WINC-926,WINC-1373: Adjust kubelet configuration for NodeAllocatable, EvictionHard and System Memory #2709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b55dd9
[nodeconfig] avoid hard-coded names in KubeletConf
jrvaldes Feb 13, 2025
7187eb4
[nodeconfig] reserve 2GiB of memory for system
jrvaldes Feb 13, 2025
fbf3580
[nodeconfig] set EnforceNodeAllocatable to none
jrvaldes Feb 13, 2025
4b4866d
[nodeconfig] explicitly set hard-evictions
jrvaldes Feb 13, 2025
4a9b9cc
[e2e] react to kubelet config updates
jrvaldes Feb 13, 2025
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
28 changes: 17 additions & 11 deletions pkg/nodeconfig/nodeconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,14 +444,6 @@ func createKubeletConf(clusterServiceCIDR string) (string, error) {
if err != nil {
return "", err
}
// Replace last character ('}') with comma
kubeletConfigData[len(kubeletConfigData)-1] = ','
// Appending this option is needed here instead of in the kubelet configuration object. Otherwise, when marshalling,
// the empty value will be omitted, so it would end up being incorrectly populated at service start time.
// Can be moved to kubelet configuration object with https://issues.redhat.com/browse/WINC-926
enforceNodeAllocatable := []byte("\"enforceNodeAllocatable\":[]}")
kubeletConfigData = append(kubeletConfigData, enforceNodeAllocatable...)

return string(kubeletConfigData), nil
}

Expand Down Expand Up @@ -674,10 +666,24 @@ func generateKubeletConfiguration(clusterDNS string) kubeletconfig.KubeletConfig
"RotateKubeletServerCertificate": true,
},
ContainerLogMaxSize: "50Mi",
EnforceNodeAllocatable: []string{
"none",
},
// hard-eviction is not yet fully supported on Windows, but the values passed are subtracted from Capacity
// to calculate the node allocatable. The recommendation is to explicitly set the supported signals available
// for Windows.
// See https://kubernetes.io/docs/concepts/scheduling-eviction/node-pressure-eviction/#eviction-signals
EvictionHard: map[string]string{
"nodefs.available": "10%",
"imagefs.available": "15%",
// containerfs.available works for Windows, but does not support overrides for thresholds
},
SystemReserved: map[string]string{
"cpu": "500m",
"ephemeral-storage": "1Gi",
"memory": "1Gi",
string(core.ResourceCPU): "500m",
string(core.ResourceEphemeralStorage): "1Gi",
// Reserve at least 2GiB of memory
// See https://kubernetes.io/docs/concepts/configuration/windows-resource-management/#resource-reservation
string(core.ResourceMemory): "2Gi",
},
ContainerRuntimeEndpoint: "npipe://./pipe/containerd-containerd",
// Registers the Kubelet with Windows specific taints so that linux pods won't get scheduled onto
Expand Down
2 changes: 1 addition & 1 deletion pkg/nodeconfig/nodeconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestCreateKubeletConf(t *testing.T) {
{
name: "valid cidr",
cidr: "10.0.128.8/24",
expectedSpec: "{\"kind\":\"KubeletConfiguration\",\"apiVersion\":\"kubelet.config.k8s.io/v1beta1\",\"syncFrequency\":\"0s\",\"fileCheckFrequency\":\"0s\",\"httpCheckFrequency\":\"0s\",\"rotateCertificates\":true,\"serverTLSBootstrap\":true,\"authentication\":{\"x509\":{\"clientCAFile\":\"C:\\\\k\\\\kubelet-ca.crt\"},\"webhook\":{\"cacheTTL\":\"0s\"},\"anonymous\":{\"enabled\":false}},\"authorization\":{\"webhook\":{\"cacheAuthorizedTTL\":\"0s\",\"cacheUnauthorizedTTL\":\"0s\"}},\"clusterDomain\":\"cluster.local\",\"clusterDNS\":[\"10.0.128.10\"],\"streamingConnectionIdleTimeout\":\"0s\",\"nodeStatusUpdateFrequency\":\"0s\",\"nodeStatusReportFrequency\":\"0s\",\"imageMinimumGCAge\":\"0s\",\"imageMaximumGCAge\":\"0s\",\"volumeStatsAggPeriod\":\"0s\",\"cgroupsPerQOS\":false,\"cpuManagerReconcilePeriod\":\"0s\",\"runtimeRequestTimeout\":\"10m0s\",\"maxPods\":250,\"resolvConf\":\"\",\"kubeAPIQPS\":50,\"kubeAPIBurst\":100,\"serializeImagePulls\":false,\"evictionPressureTransitionPeriod\":\"0s\",\"featureGates\":{\"RotateKubeletServerCertificate\":true},\"memorySwap\":{},\"containerLogMaxSize\":\"50Mi\",\"systemReserved\":{\"cpu\":\"500m\",\"ephemeral-storage\":\"1Gi\",\"memory\":\"1Gi\"},\"logging\":{\"flushFrequency\":0,\"verbosity\":0,\"options\":{\"text\":{\"infoBufferSize\":\"0\"},\"json\":{\"infoBufferSize\":\"0\"}}},\"enableSystemLogQuery\":true,\"shutdownGracePeriod\":\"0s\",\"shutdownGracePeriodCriticalPods\":\"0s\",\"crashLoopBackOff\":{},\"registerWithTaints\":[{\"key\":\"os\",\"value\":\"Windows\",\"effect\":\"NoSchedule\"}],\"registerNode\":true,\"containerRuntimeEndpoint\":\"npipe://./pipe/containerd-containerd\",\"enforceNodeAllocatable\":[]}",
expectedSpec: "{\"kind\":\"KubeletConfiguration\",\"apiVersion\":\"kubelet.config.k8s.io/v1beta1\",\"syncFrequency\":\"0s\",\"fileCheckFrequency\":\"0s\",\"httpCheckFrequency\":\"0s\",\"rotateCertificates\":true,\"serverTLSBootstrap\":true,\"authentication\":{\"x509\":{\"clientCAFile\":\"C:\\\\k\\\\kubelet-ca.crt\"},\"webhook\":{\"cacheTTL\":\"0s\"},\"anonymous\":{\"enabled\":false}},\"authorization\":{\"webhook\":{\"cacheAuthorizedTTL\":\"0s\",\"cacheUnauthorizedTTL\":\"0s\"}},\"clusterDomain\":\"cluster.local\",\"clusterDNS\":[\"10.0.128.10\"],\"streamingConnectionIdleTimeout\":\"0s\",\"nodeStatusUpdateFrequency\":\"0s\",\"nodeStatusReportFrequency\":\"0s\",\"imageMinimumGCAge\":\"0s\",\"imageMaximumGCAge\":\"0s\",\"volumeStatsAggPeriod\":\"0s\",\"cgroupsPerQOS\":false,\"cpuManagerReconcilePeriod\":\"0s\",\"runtimeRequestTimeout\":\"10m0s\",\"maxPods\":250,\"resolvConf\":\"\",\"kubeAPIQPS\":50,\"kubeAPIBurst\":100,\"serializeImagePulls\":false,\"evictionHard\":{\"imagefs.available\":\"15%\",\"nodefs.available\":\"10%\"},\"evictionPressureTransitionPeriod\":\"0s\",\"featureGates\":{\"RotateKubeletServerCertificate\":true},\"memorySwap\":{},\"containerLogMaxSize\":\"50Mi\",\"systemReserved\":{\"cpu\":\"500m\",\"ephemeral-storage\":\"1Gi\",\"memory\":\"2Gi\"},\"enforceNodeAllocatable\":[\"none\"],\"logging\":{\"flushFrequency\":0,\"verbosity\":0,\"options\":{\"text\":{\"infoBufferSize\":\"0\"},\"json\":{\"infoBufferSize\":\"0\"}}},\"enableSystemLogQuery\":true,\"shutdownGracePeriod\":\"0s\",\"shutdownGracePeriodCriticalPods\":\"0s\",\"crashLoopBackOff\":{},\"registerWithTaints\":[{\"key\":\"os\",\"value\":\"Windows\",\"effect\":\"NoSchedule\"}],\"registerNode\":true,\"containerRuntimeEndpoint\":\"npipe://./pipe/containerd-containerd\"}",
expectedErr: false,
},
{
Expand Down