Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,22 @@ spec:
# include=openshift-node-performance-${PerformanceProfile.metadata.name}
{{- range .spec.profile }}
- name: {{ .name }}
{{- if contains "include=openshift-node-performance" .data }}
# Timer migration is enabled by this profile explicitly to workaround
# https://redhat.atlassian.net/browse/OCPBUGS-86541.
# Once the NTO patch https://github.com/openshift/cluster-node-tuning-operator/pull/1542
# is backported to 4.21 you can remove this override.
data: |
[main]
{{ .data | regexFind "summary=.*" }}
include=openshift-node-performance-{{ .name }}
[sysctl]
kernel.panic_on_unrecovered_nmi=1
kernel.timer_migration=1
{{- else }}
data: |
{{- .data | nindent 8 }}
{{- end }}
{{- end }}
recommend:
{{- range .spec.recommend }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,41 @@ spec:
[main]
summary=Top-level core performance tuning overrides
- name: worker-profile-1
# Timer migration is enabled by this profile explicitly to workaround
# https://redhat.atlassian.net/browse/OCPBUGS-86541.
# Once the NTO patch https://github.com/openshift/cluster-node-tuning-operator/pull/1542
# is backported to 4.21 you can remove this override.
data: |
[main]
summary=Worker-1 core performance tuning overrides
include=openshift-node-performance-worker-profile-1
[sysctl]
kernel.panic_on_unrecovered_nmi=1
kernel.timer_migration=1
- name: worker-profile-2
# Timer migration is enabled by this profile explicitly to workaround
# https://redhat.atlassian.net/browse/OCPBUGS-86541.
# Once the NTO patch https://github.com/openshift/cluster-node-tuning-operator/pull/1542
# is backported to 4.21 you can remove this override.
data: |
[main]
summary=Worker-2 core performance tuning overrides
include=openshift-node-performance-worker-profile-2
[sysctl]
kernel.panic_on_unrecovered_nmi=1
kernel.timer_migration=1
- name: worker-profile-3
# Timer migration is enabled by this profile explicitly to workaround
# https://redhat.atlassian.net/browse/OCPBUGS-86541.
# Once the NTO patch https://github.com/openshift/cluster-node-tuning-operator/pull/1542
# is backported to 4.21 you can remove this override.
data: |
[main]
summary=Worker-3 core performance tuning overrides
include=openshift-node-performance-worker-profile-3
[sysctl]
kernel.panic_on_unrecovered_nmi=1
kernel.timer_migration=1
recommend:
- machineConfigLabels:
machineconfiguration.openshift.io/role: $mcp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ spec:
summary=Top-level ran-du performance tuning overrides
include=openshift-node-performance-openshift-node-performance-profile,ran-du-performance-architecture-common
- name: ran-du-performance-architecture-common
# Timer migration is enabled by this profile explicitly to workaround
# https://redhat.atlassian.net/browse/OCPBUGS-86541.
# Once the NTO patch https://github.com/openshift/cluster-node-tuning-operator/pull/1542
# is backported to 4.21 you can remove this override.
data: |
[main]
summary=Common cross-architecture performance tuning which also includes architecture-specific profiles
Expand All @@ -26,6 +30,8 @@ spec:
[bootloader]
cmdline_ran_rcu=rcupdate.rcu_normal_after_boot=0
cmdline_ran_efi=efi=runtime
[sysctl]
kernel.timer_migration=1
- name: ran-du-common-aarch64
data: |
[main]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ spec:
summary=Top-level ran-du performance tuning overrides
include=openshift-node-performance-openshift-node-performance-profile,ran-du-performance-architecture-common
- name: ran-du-performance-architecture-common
# Timer migration is enabled by this profile explicitly to workaround
# https://redhat.atlassian.net/browse/OCPBUGS-86541.
# Once the NTO patch https://github.com/openshift/cluster-node-tuning-operator/pull/1542
# is backported to 4.21 you can remove this override.
data: |
[main]
summary=Common cross-architecture performance tuning which also includes architecture-specific profiles
Expand All @@ -26,6 +30,8 @@ spec:
[bootloader]
cmdline_ran_rcu=rcupdate.rcu_normal_after_boot=0
cmdline_ran_efi=efi=runtime
[sysctl]
kernel.timer_migration=1
- name: ran-du-common-aarch64
data: |
[main]
Expand Down