feat: add support for CoreOS RHEL flavor #7589
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lebauce
changed the title
lebauce
force-pushed
the
main-coreos-support
branch
2 times, most recently
from
c703a0c
to
6868d15
Compare
lebauce
force-pushed
the
main-coreos-support
branch
from
6868d15
to
9fc8de3
Compare
lebauce
force-pushed
the
main-coreos-support
branch
from
9fc8de3
to
93c3356
Compare
|
@knqyf263 Could you please have a look at this one ? 🙇 |
|
@knqyf263 @DmitriyLewen Could you please take a look at this one please ? |
DmitriyLewen
reviewed
Nov 8, 2024
Comment on lines
+83
to
+90
| split := strings.SplitN(result[2], ".", 4) | ||
| major, _ = strconv.Atoi(split[0]) | ||
| if len(split) > 1 { | ||
| minor, _ = strconv.Atoi(split[1]) | ||
| } | ||
| if len(split) > 2 { | ||
| rel, _ = strconv.Atoi(split[2]) | ||
| } |
There was a problem hiding this comment.
Can you add a comment with examples why we need this split?
It seems we can just use semver.Parse on result[2]
| } | ||
|
|
||
| coreosVersion, err := semver.Parse(fmt.Sprintf("%d.%d.%d", major, minor, rel)) | ||
| if err == nil { |
There was a problem hiding this comment.
We need to return error here.
Comment on lines
+95
to
+109
| if coreos4_16, _ := semver.Parse("4.16.0"); coreosVersion.GreaterThanOrEqual(coreos4_16) { | ||
| rhelVersion = "9.4" | ||
| } else if coreos4_13, _ := semver.Parse("4.13.0"); coreosVersion.GreaterThanOrEqual(coreos4_13) { | ||
| rhelVersion = "9.2" | ||
| } else if coreos4_11, _ := semver.Parse("4.11.0"); coreosVersion.GreaterThanOrEqual(coreos4_11) { | ||
| rhelVersion = "8.6" | ||
| } else if coreos4_7_24, _ := semver.Parse("4.7.24"); coreosVersion.GreaterThanOrEqual(coreos4_7_24) { | ||
| rhelVersion = "8.4" | ||
| } else if coreos4_7_0, _ := semver.Parse("4.7.0"); coreosVersion.GreaterThanOrEqual(coreos4_7_0) { | ||
| rhelVersion = "8.3" | ||
| } else if coreos4_6_0, _ := semver.Parse("4.6.0"); coreosVersion.GreaterThanOrEqual(coreos4_6_0) { | ||
| rhelVersion = "8.2" | ||
| } else { | ||
| return types.OS{}, xerrors.Errorf("coreos: invalid redhat-release") | ||
| } |
There was a problem hiding this comment.
I'm worried it will grow with each new version.
What if create map with versions and use constrains
e.g.: 8.6: ">= 4.11, >= 4.12"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
CoreOS is based on RHEL but the parsing done for /etc/redhat-release reports the version of OpenShift instead of the version of RHEL, preventing vulnerability matching.
Related issues
Related PRs
Remove this section if you don't have related PRs.
Checklist