Skip to content

CNF-22163: Enable kubelet GracefulNodeShutdown in RAN DU #903

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

Open
jmontesi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CNF-22163: Enable kubelet GracefulNodeShutdown in RAN DU #903

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion telco-ran/configuration/kube-compare-reference/functions/unordered_list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,28 @@
{{- if hasKey $inputSystemReserved "memory" }}
{{- $systemReservedMemory = printf "\"%s\"" $inputSystemReserved.memory }}
{{- end }}
{{- end }}
{{- $shutdownGracePeriod := "" }}
{{- if hasKey $config "shutdownGracePeriod" }}
{{- $shutdownGracePeriod = $config.shutdownGracePeriod }}
{{- end }}
{{- $shutdownGracePeriodCriticalPods := "" }}
{{- if hasKey $config "shutdownGracePeriodCriticalPods" }}
{{- $shutdownGracePeriodCriticalPods = $config.shutdownGracePeriodCriticalPods }}
{{- end }}
kubeletconfig.experimental: |
{
{{- if $result }}
"allowedUnsafeSysctls":{{ $result | toJson }},
{{- end }}
{{- if $systemReservedMemory }}
"systemReserved":{"memory":{{ $systemReservedMemory }}}
"systemReserved":{"memory":{{ $systemReservedMemory }}},
{{- end }}
{{- if $shutdownGracePeriod }}
"shutdownGracePeriod":"{{ $shutdownGracePeriod }}",
{{- end }}
{{- if $shutdownGracePeriodCriticalPods }}
"shutdownGracePeriodCriticalPods":"{{ $shutdownGracePeriodCriticalPods }}"
Comment on lines +87 to +93

@coderabbitai coderabbitai Bot Aug 11, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Guard commas for omitted optional fields.

Line 87 and Line 90 always emit trailing commas. Lines 89-94 conditionally emit the following fields. An annotation that omits either field can therefore render invalid JSON, such as {"systemReserved":{"memory":"11Gi"},}. Emit each comma only when a later field exists, or serialize a constructed object instead.

Proposed fix 
-       "systemReserved":{"memory":{{ $systemReservedMemory }}},
+       "systemReserved":{"memory":{{ $systemReservedMemory }}}{{ if or $shutdownGracePeriod $shutdownGracePeriodCriticalPods }},{{ end }}
...
-       "shutdownGracePeriod":"{{ $shutdownGracePeriod }}",
+       "shutdownGracePeriod":"{{ $shutdownGracePeriod }}"{{ if $shutdownGracePeriodCriticalPods }},{{ end }}

Add render coverage for both fields present, either field absent, and both fields absent.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"systemReserved":{"memory":{{ $systemReservedMemory }}},
{{- end }}
{{- if $shutdownGracePeriod }}
"shutdownGracePeriod":"{{ $shutdownGracePeriod }}",
{{- end }}
{{- if $shutdownGracePeriodCriticalPods }}
"shutdownGracePeriodCriticalPods":"{{ $shutdownGracePeriodCriticalPods }}"
"systemReserved":{"memory":{{ $systemReservedMemory }}}{{ if or $shutdownGracePeriod $shutdownGracePeriodCriticalPods }},{{ end }}
{{- end }}
{{- if $shutdownGracePeriod }}
"shutdownGracePeriod":"{{ $shutdownGracePeriod }}"{{ if $shutdownGracePeriodCriticalPods }},{{ end }}
{{- end }}
{{- if $shutdownGracePeriodCriticalPods }}
"shutdownGracePeriodCriticalPods":"{{ $shutdownGracePeriodCriticalPods }}"
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@telco-ran/configuration/kube-compare-reference/functions/unordered_list.tmpl`
around lines 87 - 93, Update the unordered-list template’s optional-field comma
handling so rendered JSON remains valid when either or both shutdown
grace-period fields are omitted; emit separators only when a subsequent field
exists, while preserving output when both fields are present. Add render
coverage for both fields present, each field absent individually, and both
fields absent.

{{- end }}
}
{{- end }}
4 changes: 3 additions & 1 deletion telco-ran/configuration/kube-compare-reference/hack/arch/aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ node_tuning_operator_PerformanceProfile:
annotations:
kubeletconfig.experimental: |
{
"systemReserved":{"memory":"11Gi"}
"systemReserved":{"memory":"11Gi"},
"shutdownGracePeriod":"30s",
"shutdownGracePeriodCriticalPods":"10s"
}
spec:
additionalKernelArgs:
Expand Down
4 changes: 3 additions & 1 deletion telco-ran/configuration/kube-compare-reference/hack/arch/x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ node_tuning_operator_PerformanceProfile:
annotations:
kubeletconfig.experimental: |
{
"systemReserved":{"memory":"11Gi"}
"systemReserved":{"memory":"11Gi"},
"shutdownGracePeriod":"30s",
"shutdownGracePeriodCriticalPods":"10s"
}
spec:
additionalKernelArgs:
Expand Down
6 changes: 5 additions & 1 deletion ...configuration/source-crs/node-tuning-operator/aarch64/PerformanceProfile-SetSelector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
ran.openshift.io/reference-configuration: "ran-du.redhat.com"
# systemReserved: when used, it should be tailored for each environment.
# shutdownGracePeriod: enables kubelet GracefulNodeShutdown to reduce
# IBU upgrade downtime. Non-critical pods get 20s, critical pods get 10s.
kubeletconfig.experimental: |
{
"systemReserved":{"memory":"11Gi"}
"systemReserved":{"memory":"11Gi"},
"shutdownGracePeriod":"30s",
"shutdownGracePeriodCriticalPods":"10s"
}
spec:
# Note: The defaults here are for Grace Hopper systems. Other systems may alternative PCI or iommu settings such as:
Expand Down
6 changes: 5 additions & 1 deletion telco-ran/configuration/source-crs/node-tuning-operator/aarch64/PerformanceProfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
ran.openshift.io/reference-configuration: "ran-du.redhat.com"
# systemReserved: when used, it should be tailored for each environment.
# shutdownGracePeriod: enables kubelet GracefulNodeShutdown to reduce
# IBU upgrade downtime. Non-critical pods get 20s, critical pods get 10s.
kubeletconfig.experimental: |
{
"systemReserved":{"memory":"11Gi"}
"systemReserved":{"memory":"11Gi"},
"shutdownGracePeriod":"30s",
"shutdownGracePeriodCriticalPods":"10s"
}
spec:
# Note: The defaults here are for Grace Hopper systems. Other systems may alternative PCI or iommu settings such as:
Expand Down
6 changes: 5 additions & 1 deletion .../configuration/source-crs/node-tuning-operator/x86_64/PerformanceProfile-SetSelector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
ran.openshift.io/reference-configuration: "ran-du.redhat.com"
# systemReserved: when used, it should be tailored for each environment.
# shutdownGracePeriod: enables kubelet GracefulNodeShutdown to reduce
# IBU upgrade downtime. Non-critical pods get 20s, critical pods get 10s.
kubeletconfig.experimental: |
{
"systemReserved":{"memory":"11Gi"}
"systemReserved":{"memory":"11Gi"},
"shutdownGracePeriod":"30s",
"shutdownGracePeriodCriticalPods":"10s"
}
spec:
# Optional kernel arguments:
Expand Down
6 changes: 5 additions & 1 deletion telco-ran/configuration/source-crs/node-tuning-operator/x86_64/PerformanceProfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ metadata:
ran.openshift.io/ztp-deploy-wave: "10"
ran.openshift.io/reference-configuration: "ran-du.redhat.com"
# systemReserved: when used, it should be tailored for each environment.
# shutdownGracePeriod: enables kubelet GracefulNodeShutdown to reduce
# IBU upgrade downtime. Non-critical pods get 20s, critical pods get 10s.
kubeletconfig.experimental: |
{
"systemReserved":{"memory":"11Gi"}
"systemReserved":{"memory":"11Gi"},
"shutdownGracePeriod":"30s",
"shutdownGracePeriodCriticalPods":"10s"
}
spec:
# Optional kernel arguments:
Expand Down
Loading