Merge pull request #5365 from openshift-cherrypick-robot/cherry-pick-5362-to-release-4.20

[release-4.20] OCPBUGS-63337: RHEL10 RT kernel packages filtering

Author: openshift-merge-bot[bot]

pkg/daemon/osrelease/osrelease.go

@@ -109,6 +109,11 @@ func (os OperatingSystem) IsEL9() bool {
 	return os.IsEL() && strings.HasPrefix(os.version, "9.") || os.version == "9"
 }
 
+// IsEL10 is true if the OS is RHCOS 10 or SCOS 10
+func (os OperatingSystem) IsEL10() bool {
+	return os.IsEL() && strings.HasPrefix(os.version, "10.") || os.version == "10"
+}
+
 // IsFCOS is true if the OS is Fedora CoreOS
 func (os OperatingSystem) IsFCOS() bool {
 	return os.id == fedora && os.variantID == coreos

pkg/daemon/osrelease/osrelease_test.go

@@ -132,11 +132,36 @@ VARIANT="CoreOS"
 VARIANT_ID=coreos
 OSTREE_VERSION='37.20230126.20.0'`
 
+	rhcos101OSReleaseContents := `NAME="Red Hat Enterprise Linux CoreOS"
+VERSION="10.1.20251005-0 (Coughlan)"
+ID="rhel"
+ID_LIKE="centos fedora"
+VERSION_ID="10.1"
+PLATFORM_ID="platform:el10"
+PRETTY_NAME="Red Hat Enterprise Linux CoreOS 10.1.20251005-0 (Coughlan)"
+ANSI_COLOR="0;31"
+LOGO="fedora-logo-icon"
+CPE_NAME="cpe:/o:redhat:enterprise_linux:10.1"
+HOME_URL="https://www.redhat.com/"
+VENDOR_NAME="Red Hat"
+VENDOR_URL="https://www.redhat.com/"
+DOCUMENTATION_URL="https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/10"
+BUG_REPORT_URL="https://issues.redhat.com/"
+REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 10"
+REDHAT_BUGZILLA_PRODUCT_VERSION=10.1
+REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux"
+REDHAT_SUPPORT_PRODUCT_VERSION="10.1 Beta"
+OSTREE_VERSION='10.1.20251005-0'
+VARIANT=CoreOS
+VARIANT_ID=coreos
+OPENSHIFT_VERSION="4.20"`
+
 	testCases := []struct {
 		Name                   string
 		OSReleaseContents      string
 		IsEL                   bool
 		IsEL9                  bool
+		IsEL10                 bool
 		IsFCOS                 bool
 		IsSCOS                 bool
 		IsCoreOSVariant        bool
@@ -148,6 +173,7 @@ OSTREE_VERSION='37.20230126.20.0'`
 			OSReleaseContents:      rhcos86OSReleaseContents,
 			IsEL:                   true,
 			IsEL9:                  false,
+			IsEL10:                 false,
 			IsFCOS:                 false,
 			IsSCOS:                 false,
 			IsCoreOSVariant:        true,
@@ -165,11 +191,24 @@ OSTREE_VERSION='37.20230126.20.0'`
 			IsLikeTraditionalRHEL7: false,
 			ToPrometheusLabel:      "RHCOS",
 		},
+		{
+			Name:                   "RHCOS 10.1",
+			OSReleaseContents:      rhcos101OSReleaseContents,
+			IsEL:                   true,
+			IsEL9:                  false,
+			IsEL10:                 true,
+			IsFCOS:                 false,
+			IsSCOS:                 false,
+			IsCoreOSVariant:        true,
+			IsLikeTraditionalRHEL7: false,
+			ToPrometheusLabel:      "RHEL",
+		},
 		{
 			Name:                   "Fedora 37 Server",
 			OSReleaseContents:      fedora37ServerOSReleaseContents,
 			IsEL:                   false,
 			IsEL9:                  false,
+			IsEL10:                 false,
 			IsFCOS:                 false,
 			IsSCOS:                 false,
 			IsCoreOSVariant:        false,
@@ -181,6 +220,7 @@ OSTREE_VERSION='37.20230126.20.0'`
 			OSReleaseContents:      scosOSReleaseContents,
 			IsEL:                   true,
 			IsEL9:                  true,
+			IsEL10:                 false,
 			IsFCOS:                 false,
 			IsSCOS:                 true,
 			IsCoreOSVariant:        true,
@@ -192,6 +232,7 @@ OSTREE_VERSION='37.20230126.20.0'`
 			OSReleaseContents:      fcosOSReleaseContents,
 			IsEL:                   false,
 			IsEL9:                  false,
+			IsEL10:                 false,
 			IsFCOS:                 true,
 			IsSCOS:                 false,
 			IsCoreOSVariant:        true,
@@ -209,6 +250,7 @@ OSTREE_VERSION='37.20230126.20.0'`
 
 			assert.Equal(t, testCase.IsEL, os.IsEL(), "expected IsEL() to be %v", testCase.IsEL)
 			assert.Equal(t, testCase.IsEL9, os.IsEL9(), "expected IsEL9() to be %v", testCase.IsEL9)
+			assert.Equal(t, testCase.IsEL10, os.IsEL10(), "expected IsEL10() to be %v", testCase.IsEL9)
 			assert.Equal(t, testCase.IsCoreOSVariant, os.IsCoreOSVariant(), "expected IsCoreOSVariant() to be %v", testCase.IsCoreOSVariant)
 			assert.Equal(t, testCase.IsFCOS, os.IsFCOS(), "expected IsFCOS() to be %v", testCase.IsFCOS)
 			assert.Equal(t, testCase.IsSCOS, os.IsSCOS(), "expected IsSCOS() to be %v", testCase.IsSCOS)

pkg/daemon/update.go

@@ -67,6 +67,13 @@ const (
 	postConfigChangeActionReboot = "reboot"
 )
 
+// releaseKernelPackages contains the list of packages per kernel type a given OS release uses
+type releaseKernelPackages struct {
+	defaultKernel   []string
+	realtimeKernel  []string
+	hugePagesKernel []string
+}
+
 func getNodeRef(node *corev1.Node) *corev1.ObjectReference {
 	return &corev1.ObjectReference{
 		Kind: "Node",
@@ -1719,33 +1726,27 @@ func (dn *CoreOSDaemon) switchKernel(oldConfig, newConfig *mcfgv1.MachineConfig)
 		return fmt.Errorf("64k-pages is only supported for aarch64 architecture")
 	}
 
-	// TODO: Drop this code and use https://github.com/coreos/rpm-ostree/issues/2542 instead
-	defaultKernel := []string{"kernel", "kernel-core", "kernel-modules", "kernel-modules-core", "kernel-modules-extra"}
-	// Note this list explicitly does *not* include kernel-rt as that is a meta-package that tries to pull in a lot
-	// of other dependencies we don't want for historical reasons.
-	realtimeKernel := []string{"kernel-rt-core", "kernel-rt-modules", "kernel-rt-modules-extra", "kernel-rt-kvm"}
-	hugePagesKernel := []string{"kernel-64k-core", "kernel-64k-modules", "kernel-64k-modules-core", "kernel-64k-modules-extra"}
-
 	if oldKtype != newKtype {
 		logSystem("Initiating switch to kernel %s", newKtype)
 	} else {
 		logSystem("Re-applying kernel type %s", newKtype)
 	}
 
+	kernelPackages := dn.getKernelPackagesForRelease()
 	if newKtype == ctrlcommon.KernelTypeRealtime {
 		// Switch to RT kernel
 		args := []string{"override", "remove"}
-		args = append(args, defaultKernel...)
-		for _, pkg := range realtimeKernel {
+		args = append(args, kernelPackages.defaultKernel...)
+		for _, pkg := range kernelPackages.realtimeKernel {
 			args = append(args, constants.RPMOSTreeInstallArg, pkg)
 		}
 
 		return runRpmOstree(args...)
 	} else if newKtype == ctrlcommon.KernelType64kPages {
 		// Switch to 64k pages kernel
 		args := []string{"override", "remove"}
-		args = append(args, defaultKernel...)
-		for _, pkg := range hugePagesKernel {
+		args = append(args, kernelPackages.defaultKernel...)
+		for _, pkg := range kernelPackages.hugePagesKernel {
 			args = append(args, constants.RPMOSTreeInstallArg, pkg)
 		}
 
@@ -1754,6 +1755,26 @@ func (dn *CoreOSDaemon) switchKernel(oldConfig, newConfig *mcfgv1.MachineConfig)
 	return fmt.Errorf("unhandled kernel type %s", newKtype)
 }
 
+// getKernelPackagesForRelease returns the list of kernel packaged for the running OS release.
+func (dn *CoreOSDaemon) getKernelPackagesForRelease() releaseKernelPackages {
+	// TODO: Drop this code and use https://github.com/coreos/rpm-ostree/issues/2542 instead
+
+	kernelPackages := releaseKernelPackages{
+		defaultKernel:   []string{"kernel", "kernel-core", "kernel-modules", "kernel-modules-core", "kernel-modules-extra"},
+		hugePagesKernel: []string{"kernel-64k-core", "kernel-64k-modules", "kernel-64k-modules-core", "kernel-64k-modules-extra"},
+		// Note this list explicitly does *not* include kernel-rt as that is a meta-package that tries to pull in a lot
+		// of other dependencies we don't want for historical reasons.
+		realtimeKernel: []string{"kernel-rt-core", "kernel-rt-modules", "kernel-rt-modules-extra"},
+	}
+
+	// RHEL10 early bugfix of OCPBUGS-62925
+	// RHEL10 doesn't ship with kernel-rt-kvm
+	if !dn.os.IsEL10() {
+		kernelPackages.realtimeKernel = append(kernelPackages.realtimeKernel, "kernel-rt-kvm")
+	}
+	return kernelPackages
+}
+
 // updateFiles writes files specified by the nodeconfig to disk. it also writes
 // systemd units. there is no support for multiple filesystems at this point.
 //