Set OpenShift 4.11 as the default install version #3036
Merged
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
hawkowl
requested review from
jewzaam,
bennerv,
rogbas,
petrkotas,
jharrington22,
cblecker,
facchettos,
cadenmarchese,
UlrichSchlueter,
s-amann,
SudoBrendan,
ellis-johnson,
yjst2012 and
anshulvermapatel
as code owners
hawkowl
added
next-up
ready-for-review
skippy
jhoreman
approved these changes
Jul 17, 2023
petrkotas
approved these changes
Jul 18, 2023
bennerv
reviewed
Jul 18, 2023
Comment on lines
+28
to
+40
| // DefaultMinorVersion describes the minor OpenShift version to default to | ||
| var DefaultMinorVersion = 11 | ||
|
|
||
| // DefaultInstallStreams describes the latest version of our supported streams | ||
| var DefaultInstallStreams = map[int]*Stream{ | ||
| 10: { | ||
| Version: NewVersion(4, 10, 63), | ||
| PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:340091aefa0bba06bbb99cc58cb1f2b73404c832f72b83c526b8e7677efbecef", | ||
| }, | ||
| 11: { | ||
| Version: NewVersion(4, 11, 44), | ||
| PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:52cbfbbeb9cc03b49c2788ac7333e63d3dae14673e01a9d8e59270f3a8390ed3", | ||
| }, |
There was a problem hiding this comment.
I know this is already merged, but why add the 4.10 stuff to a DefaultInstallStreams struct if we're not setting 4.10 as a default anymore?
We can't pass in "4.10" as an install version and it picks the version above.
This block of code might confuse other team members (it confused me)
There was a problem hiding this comment.
@bennerv I've done it like this because the discoverycache right now is 4.10 and so I want what the default install stream for 4.10 used to be. Maybe it doesn't make as much sense because you can't ask for "4.10" and get anything. (should we have that, maybe?)
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.
Which issue this PR addresses:
Fixes https://issues.redhat.com/browse/ARO-3675
What this PR does / why we need it:
Changes the default install version to 4.11, updates the PR E2E to do so, and doesn't error on the discoverycache being generated in 4.10.
Test plan for issue:
E2E
Is there any documentation that needs to be updated for this PR?
Don't think so?