Skip to content

Commit

Permalink
OCPBUGS-19351: Keep Profile status.bootcmdline around
Browse files Browse the repository at this point in the history
openshift#766
introduced a fix for OCPBUGS-17941 by tightening the rules for modifying
Tuned Profiles.  Unfortunately, the fix introduced an upgrade issue
(race), where the old operator still relies on removed Profile
status.bootcmdline.

Reintroduce the field for the old operator, so that it does not cause
additional reboots by seeing the bootcmdline as empty.  The
status.bootcmdline field is not used in any way by the new operator, it
is marked as obsolete and will be removed in the future.

Resolves: OCPBUGS-19351
  • Loading branch information
jmencak committed Sep 20, 2023
1 parent c2ba801 commit b473a82
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions manifests/20-profile.crd.yaml
Expand Up @@ -80,6 +80,9 @@ spec:
required:
- tunedProfile
properties:
bootcmdline:
description: kernel parameters calculated by tuned for the active Tuned profile; this field is OBSOLETE and will be removed, see OCPBUGS-19351
type: string
conditions:
description: conditions represents the state of the per-node Profile application
type: array
Expand Down
4 changes: 4 additions & 0 deletions pkg/apis/tuned/v1/tuned_types.go
Expand Up @@ -169,6 +169,10 @@ type ProfileConfig struct {
// ProfileStatus is the status for a Profile resource; the status is for internal use only
// and its fields may be changed/removed in the future.
type ProfileStatus struct {
// kernel parameters calculated by tuned for the active Tuned profile; this field is OBSOLETE and will be removed, see OCPBUGS-19351
// +optional
Bootcmdline string `json:"bootcmdline"`

// the current profile in use by the Tuned daemon
TunedProfile string `json:"tunedProfile"`

Expand Down

0 comments on commit b473a82

Please sign in to comment.