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

OCPBUGS-50849: add RHEL variant to IsEL() check #4856

Merged
merged 2 commits into from
Feb 25, 2025
Merged

OCPBUGS-50849: add RHEL variant to IsEL() check #4856

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
e5accd6
daemon/osrelease: add additional case for IsEL()
djoshy Feb 19, 2025
1169e57
debug log
djoshy Feb 24, 2025
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
6 changes: 5 additions & 1 deletion pkg/daemon/osrelease/osrelease.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,12 @@ func (os OperatingSystem) BaseVersionMajor() string {

// IsEL is true if the OS is an Enterprise Linux variant of CoreOS
// i.e. RHEL CoreOS (RHCOS) or CentOS Stream CoreOS (SCOS)
//
// In 4.19, os-release content has been changed as part of
// https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/split-rhcos-into-layers.md
// Additional info here: https://github.com/openshift/enhancements/pull/1755
func (os OperatingSystem) IsEL() bool {
return os.id == rhcos || os.id == scos
return os.id == rhcos || os.id == scos || (os.id == rhel && os.variantID == coreos)
}

// IsEL8 is true if the OS is RHCOS 8 or SCOS 8
Expand Down
1 change: 1 addition & 0 deletions pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1786,6 +1786,7 @@ func (dn *CoreOSDaemon) switchKernel(oldConfig, newConfig *mcfgv1.MachineConfig)
// We support Kernel update only on RHCOS and SCOS nodes
if !dn.os.IsEL() {
klog.Info("updating kernel on non-RHCOS nodes is not supported")
klog.Infof("Detected osrelease \n %+q", dn.os)
return nil
}

Expand Down