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

Jump to bottom

[release-4.11] OCPBUGS-4945: Do not allow empty system reserved values #3459

Merged
merged 1 commit into from Jan 13, 2023
+28 −7
Merged

[release-4.11] OCPBUGS-4945: Do not allow empty system reserved values #3459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/controller/kubelet-config/helpers.go
View file
Open in desktop
Expand Up @@ -37,19 +37,19 @@ func createNewKubeletDynamicSystemReservedIgnition(autoSystemReserved *bool, use
autoNodeSizing = strconv.FormatBool(*autoSystemReserved)
}

if val, ok := userDefinedSystemReserved["memory"]; ok {
if val, ok := userDefinedSystemReserved["memory"]; ok && val != "" {
systemReservedMemory = val
} else {
systemReservedMemory = "1Gi"
}

if val, ok := userDefinedSystemReserved["cpu"]; ok {
if val, ok := userDefinedSystemReserved["cpu"]; ok && val != "" {
systemReservedCPU = val
} else {
systemReservedCPU = "500m"
}

if val, ok := userDefinedSystemReserved["ephemeral-storage"]; ok {
if val, ok := userDefinedSystemReserved["ephemeral-storage"]; ok && val != "" {
systemReservedEphemeralStorage = val
} else {
systemReservedEphemeralStorage = "1Gi"
Expand Down
29 changes: 25 additions & 4 deletions templates/common/_base/files/kubelet-auto-sizing.yaml
View file
Open in desktop
Expand Up @@ -77,19 +77,40 @@ contents:
function dynamic_pid_sizing {
echo "Not implemented yet"
}
function set_memory {
SYSTEM_RESERVED_MEMORY=$1
if [ -z "${SYSTEM_RESERVED_MEMORY}" ]; then
SYSTEM_RESERVED_MEMORY="1Gi"
fi
echo "SYSTEM_RESERVED_MEMORY=${SYSTEM_RESERVED_MEMORY}" >> ${NODE_SIZES_ENV}
}
function set_cpu {
SYSTEM_RESERVED_CPU=$1
if [ -z "${SYSTEM_RESERVED_CPU}" ]; then
SYSTEM_RESERVED_CPU="500m"
fi
echo "SYSTEM_RESERVED_CPU=${SYSTEM_RESERVED_CPU}" >> ${NODE_SIZES_ENV}
}
function set_es {
SYSTEM_RESERVED_ES=$1
if [ -z "${SYSTEM_RESERVED_ES}" ]; then
SYSTEM_RESERVED_ES="1Gi"
fi
echo "SYSTEM_RESERVED_ES=${SYSTEM_RESERVED_ES}" >> ${NODE_SIZES_ENV}
}
function dynamic_node_sizing {
rm -f ${NODE_SIZES_ENV}
dynamic_memory_sizing
dynamic_cpu_sizing
echo "SYSTEM_RESERVED_ES=$1" >> ${NODE_SIZES_ENV}
set_es $1
#dynamic_ephemeral_sizing
#dynamic_pid_sizing
}
function static_node_sizing {
rm -f ${NODE_SIZES_ENV}
echo "SYSTEM_RESERVED_MEMORY=$1" >> ${NODE_SIZES_ENV}
echo "SYSTEM_RESERVED_CPU=$2" >> ${NODE_SIZES_ENV}
echo "SYSTEM_RESERVED_ES=$3" >> ${NODE_SIZES_ENV}
set_memory $1
set_cpu $2
set_es $3
}

if [ $1 == "true" ]; then
Expand Down