Skip to content

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

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions pkg/daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/daemon/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2288,7 +2288,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
Expand Down