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

Add OS support for RHEL8.10 and Rocky9.5 #394

Merged
merged 1 commit into from
Jan 8, 2025
Merged

Add OS support for RHEL8.10 and Rocky9.5 #394

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
8 changes: 4 additions & 4 deletions pkg/platform/centos/centos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ func (c *CentOS) checkOSPackages() (bool, error) {
errLines := []string{packageInstallError}
zap.S().Debug("Checking OS Packages")

rhel8, _ = regexp.MatchString(`.*8\.[5-9]\.*`, string(version))
rocky9, _ = regexp.MatchString(`.*9\.[1-4]\.*`, string(version))
rhel8, _ = regexp.MatchString(`.*8\.[5-10]\.*`, string(version))
rocky9, _ = regexp.MatchString(`.*9\.[1-5]\.*`, string(version))

if platform.SkipOSChecks {
rhel8, _ = regexp.MatchString(`8\.\d{1,2}`, string(version))
Expand Down Expand Up @@ -181,7 +181,7 @@ func (c *CentOS) checkEnabledRepos() (bool, error) {

var centos, rhel8 bool
centos, _ = regexp.MatchString(`.*7\.[3-9]\.*`, string(version))
rhel8, _ = regexp.MatchString(`.*8\.[5-9]\.*`, string(version))
rhel8, _ = regexp.MatchString(`.*8\.[5-10]\.*`, string(version))

if platform.SkipOSChecks {
centos, _ = regexp.MatchString(`7\.\d{1,2}`, string(version))
Expand Down Expand Up @@ -379,7 +379,7 @@ func (c *CentOS) Version() (string, error) {
return "redhat", nil
}
}
if match, _ := regexp.MatchString(`.*7\.[3-9]\.*|.*8\.[5-9]\.*|.*9\.[1-4]\.*`, string(version)); match {
if match, _ := regexp.MatchString(`.*7\.[3-9]\.*|.*8\.[5-10]\.*|.*9\.[1-5]\.*`, string(version)); match {
return "redhat", nil
}
return "", fmt.Errorf("Unable to determine OS type: %s", string(version))
Expand Down
2 changes: 1 addition & 1 deletion pkg/pmk/checkNode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func CheckNode(ctx objects.Config, allClients client.Client, auth keystone.Keyst
case "redhat":
platform = centos.NewCentOS(allClients.Executor)
default:
return RequiredFail, fmt.Errorf("This OS is not supported. Supported operating systems are: Ubuntu (18.04, 20.04, 22.04), CentOS 7.[3-9], RHEL 7.[3-9] & RHEL 8.[5-9] & Rocky 9.[1-4]")
return RequiredFail, fmt.Errorf("This OS is not supported. Supported operating systems are: Ubuntu (18.04, 20.04, 22.04), CentOS 7.[3-9], RHEL 7.[3-9], RHEL 8.[5-10] & Rocky 9.[1-5]")
bharath-pf9 marked this conversation as resolved.
Show resolved Hide resolved
}

if err = allClients.Segment.SendEvent("Starting CheckNode", auth, checkPass, ""); err != nil {
Expand Down
Loading