[SRVKP-7207] verify olmskiprange path #613
Open
Conversation
This file contains hidden or 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
pkg/oc/oc.go
Outdated
| } | ||
| firstLine := lines[0] | ||
| pipelineVersion := os.Getenv("OPERATOR_VERSION") | ||
| if strings.Contains(firstLine, pipelineVersion) { |
Collaborator
There was a problem hiding this comment.
for upgrade, there are two cases
- for upgrade from 1.17.1 to 1.18.0
- if there is a minor release (for eg: 1.16.4 -> 1.17.1) it would show as 1.16.4 -> 1.17.0 and 1.17.0 -> 1.17.1. could you check this?
ppitonak
requested changes
Apr 22, 2025
pkg/oc/oc.go
Outdated
| firstLine := lines[0] | ||
| pipelineVersion := os.Getenv("OPERATOR_VERSION") | ||
| if strings.Contains(firstLine, pipelineVersion) { | ||
| log.Printf("Success: OPERATOR_VERSION '%s' matches the first line of OLM Skip Range: '%s'", pipelineVersion, firstLine) |
Member
There was a problem hiding this comment.
If I understand it correctly, first line refers to the channel latest. Is the order of lines guaranteed? I am not sure. IMHO it would be much safer to get data in format similar to this one
latest >=1.18.0 <5.0.5-593
pipelines-1.14 >=1.13.0 <1.14.6
pipelines-1.15 >=1.14.0 <1.15.2
pipelines-1.16 >=1.16.0 <1.16.3
pipelines-1.17 >=1.17.0 <1.17.1
pipelines-1.18 >=1.17.0 <1.18.0
pipelines-5.0 >=1.18.0 <5.0.5-593
pkg/oc/oc.go
Outdated
| preUpgradeSkipRange, preExists := skipRangeData[preUpgradeSkipRange] | ||
| postUpgradeSkipRange, postExists := skipRangeData[postUpgradeSkipRange] | ||
| if !preExists || !postExists || preUpgradeSkipRange == "" || postUpgradeSkipRange == "" { | ||
| log.Printf("Error: One of the skip ranges is missing or empty. Pre-Upgrade: %v, Post-Upgrade: %v", preUpgradeSkipRange, postUpgradeSkipRange) |
Member
There was a problem hiding this comment.
We don't need log.Printf when it's followed by testsuit.T.Fail
pkg/oc/oc.go
Outdated
| } | ||
| log.Printf("Pre-Upgrade Skip Range: %v", preUpgradeSkipRange) | ||
| log.Printf("Post-Upgrade Skip Range: %v", postUpgradeSkipRange) | ||
| if preUpgradeSkipRange == postUpgradeSkipRange { |
Member
There was a problem hiding this comment.
I don't understand this condition... shouldn't equality of annotation mean what something is wrong? 🤔
manthinasai
force-pushed
the
olm_skiprange
branch
from
055558b to
e19bc7d
Compare
manthinasai
force-pushed
the
olm_skiprange
branch
from
e19bc7d to
edd456e
Compare
manthinasai
force-pushed
the
olm_skiprange
branch
from
edd456e to
823a57d
Compare
- Added extractMajorMinor function to extract major.minor from full version - Fixed channel name matching to use major.minor (e.g., 1.19.2 -> 1.19) - Channel pipelines-1.19 now correctly matches OSP_VERSION 1.19.2 - Updated error messages to show both full version and major.minor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Validate OperatorVersion in OlmSkipRange for nightly
Validate OperatorVersion in OlmSkipRange for releases
Validate olm skiprange pre & post upgrade