Merge pull request #5415 from dkhater-redhat/rhel10-compatible

MCO-1976: [Dev] Fix RHEL9-specific MCD Logic for RHEL10/CentOS10 Compatibility

Author: openshift-merge-bot[bot]

pkg/daemon/daemon.go

@@ -535,10 +535,19 @@ func ReexecuteForTargetRoot(target string) error {
 	if sourceOsVersion.IsLikeRHEL() && targetOsVersion.IsLikeRHEL() {
 		sourceMajor := sourceOsVersion.BaseVersionMajor()
 		targetMajor := targetOsVersion.BaseVersionMajor()
-		if sourceMajor == "9" && targetMajor == "8" {
+
+		// When container is newer than target, use target-compatible binary
+		switch {
+		case sourceMajor == "10" && targetMajor == "9":
+			sourceBinarySuffix = ".rhel9"
+			klog.Info("container is rhel10, target is rhel9")
+		case sourceMajor == "10" && targetMajor == "8":
+			sourceBinarySuffix = ".rhel8"
+			klog.Info("container is rhel10, target is rhel8")
+		case sourceMajor == "9" && targetMajor == "8":
 			sourceBinarySuffix = ".rhel8"
 			klog.Info("container is rhel9, target is rhel8")
-		} else {
+		default:
 			klog.Infof("using appropriate binary for source=rhel-%s target=rhel-%s", sourceMajor, targetMajor)
 		}
 	} else {

pkg/daemon/update.go

@@ -2298,7 +2298,7 @@ func (dn *Daemon) updateKubeConfigPermission() error {
 // (/home/core/.ssh/authorized_keys.d/ignition) or the old SSH key path
 // (/home/core/.ssh/authorized_keys)
 func (dn *Daemon) useNewSSHKeyPath() bool {
-	return dn.os.IsEL9() || dn.os.IsFCOS() || dn.os.IsSCOS()
+	return dn.os.IsEL9() || dn.os.IsEL10() || dn.os.IsFCOS() || dn.os.IsSCOS()
 }
 
 // Update a given PasswdUser's SSHKey