Skip to content

[release-4.9] OCPBUGS-4051: Add ephemeral storage to kubelet system reserved args #3429

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
openshift-merge-robot merged 2 commits into from
Feb 3, 2023
Merged

[release-4.9] OCPBUGS-4051: Add ephemeral storage to kubelet system reserved args #3429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94714b3
Add ephemeral storage to kubelet system reserved args
harche Oct 13, 2022
7397027
Do not allow empty system reserved values
harche Nov 30, 2022
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: 11 additions & 3 deletions pkg/controller/kubelet-config/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,34 @@ func createNewKubeletDynamicSystemReservedIgnition(autoSystemReserved *bool, use
var autoNodeSizing string
var systemReservedMemory string
var systemReservedCPU string
var systemReservedEphemeralStorage string

if autoSystemReserved == nil {
autoNodeSizing = "false"
} else {
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"
}

config := fmt.Sprintf("NODE_SIZING_ENABLED=%s\nSYSTEM_RESERVED_MEMORY=%s\nSYSTEM_RESERVED_CPU=%s\n", autoNodeSizing, systemReservedMemory, systemReservedCPU)
if val, ok := userDefinedSystemReserved["ephemeral-storage"]; ok && val != "" {
systemReservedEphemeralStorage = val
} else {
systemReservedEphemeralStorage = "1Gi"
}

config := fmt.Sprintf("NODE_SIZING_ENABLED=%s\nSYSTEM_RESERVED_MEMORY=%s\nSYSTEM_RESERVED_CPU=%s\nSYSTEM_RESERVED_ES=%s\n",
autoNodeSizing, systemReservedMemory, systemReservedCPU, systemReservedEphemeralStorage)

mode := 0644
overwrite := true
Expand Down
6 changes: 6 additions & 0 deletions pkg/controller/kubelet-config/kubelet_config_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,7 @@ func (ctrl *Controller) addAnnotation(cfg *mcfgv1.KubeletConfig, annotationKey,

// syncKubeletConfig will sync the kubeletconfig with the given key.
// This function is not meant to be invoked concurrently with the same key.
//
//nolint:gocyclo
func (ctrl *Controller) syncKubeletConfig(key string) error {
startTime := time.Now()
Expand Down Expand Up @@ -578,6 +579,11 @@ func (ctrl *Controller) syncKubeletConfig(key string) error {
delete(specKubeletConfig.SystemReserved, "cpu")
}

if val, ok := specKubeletConfig.SystemReserved["ephemeral-storage"]; ok {
userDefinedSystemReserved["ephemeral-storage"] = val
delete(specKubeletConfig.SystemReserved, "ephemeral-storage")
}

// FeatureGates must be set from the FeatureGate.
// Remove them here to prevent the specKubeletConfig merge overwriting them.
specKubeletConfig.FeatureGates = nil
Expand Down
3 changes: 2 additions & 1 deletion templates/common/_base/files/kubelet-auto-node-sizing-enabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ contents:
inline: |
NODE_SIZING_ENABLED=false
SYSTEM_RESERVED_MEMORY=1Gi
SYSTEM_RESERVED_CPU=500m
SYSTEM_RESERVED_CPU=500m
SYSTEM_RESERVED_ES=1Gi
31 changes: 27 additions & 4 deletions templates/common/_base/files/kubelet-auto-sizing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,46 @@ 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
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}
set_memory $1
set_cpu $2
set_es $3
}

if [ $1 == "true" ]; then
dynamic_node_sizing
dynamic_node_sizing $4
elif [ $1 == "false" ]; then
static_node_sizing $2 $3
static_node_sizing $2 $3 $4
else
echo "Unrecongnized command line option. Valid options are \"true\" or \"false\""
fi
Expand Down
2 changes: 1 addition & 1 deletion templates/common/_base/units/kubelet-auto-node-size.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ contents: |
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=/etc/node-sizing-enabled.env
ExecStart=/bin/bash /usr/local/sbin/dynamic-system-reserved-calc.sh ${NODE_SIZING_ENABLED} ${SYSTEM_RESERVED_MEMORY} ${SYSTEM_RESERVED_CPU}
ExecStart=/bin/bash /usr/local/sbin/dynamic-system-reserved-calc.sh ${NODE_SIZING_ENABLED} ${SYSTEM_RESERVED_MEMORY} ${SYSTEM_RESERVED_CPU} ${SYSTEM_RESERVED_ES}
[Install]
RequiredBy=kubelet.service
2 changes: 0 additions & 2 deletions templates/master/01-master-kubelet/_base/files/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ contents:
serializeImagePulls: false
staticPodPath: /etc/kubernetes/manifests
systemCgroups: /system.slice
systemReserved:
ephemeral-storage: 1Gi
featureGates:
APIPriorityAndFairness: true
LegacyNodeRoleBehavior: false
Expand Down
2 changes: 1 addition & 1 deletion templates/master/01-master-kubelet/_base/units/kubelet.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ contents: |
--hostname-override=${KUBELET_NODE_NAME} \
--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
--pod-infra-container-image={{.Images.infraImageKey}} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY},ephemeral-storage=${SYSTEM_RESERVED_ES} \
--v=${KUBELET_LOG_LEVEL}

Restart=always
Expand Down
2 changes: 1 addition & 1 deletion templates/master/01-master-kubelet/on-prem/units/kubelet.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ contents: |
--hostname-override=${KUBELET_NODE_NAME} \
--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
--pod-infra-container-image={{.Images.infraImageKey}} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY},ephemeral-storage=${SYSTEM_RESERVED_ES} \
--v=${KUBELET_LOG_LEVEL}

Restart=always
Expand Down
2 changes: 0 additions & 2 deletions templates/worker/01-worker-kubelet/_base/files/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ contents:
serializeImagePulls: false
staticPodPath: /etc/kubernetes/manifests
systemCgroups: /system.slice
systemReserved:
ephemeral-storage: 1Gi
featureGates:
APIPriorityAndFairness: true
LegacyNodeRoleBehavior: false
Expand Down
2 changes: 1 addition & 1 deletion templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ contents: |
{{cloudConfigFlag . }} \
--hostname-override=${KUBELET_NODE_NAME} \
--pod-infra-container-image={{.Images.infraImageKey}} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY},ephemeral-storage=${SYSTEM_RESERVED_ES} \
--v=${KUBELET_LOG_LEVEL}

Restart=always
Expand Down
2 changes: 1 addition & 1 deletion templates/worker/01-worker-kubelet/on-prem/units/kubelet.service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ contents: |
{{cloudConfigFlag . }} \
--hostname-override=${KUBELET_NODE_NAME} \
--pod-infra-container-image={{.Images.infraImageKey}} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY} \
--system-reserved=cpu=${SYSTEM_RESERVED_CPU},memory=${SYSTEM_RESERVED_MEMORY},ephemeral-storage=${SYSTEM_RESERVED_ES} \
--v=${KUBELET_LOG_LEVEL}

Restart=always
Expand Down