MGMT-3353 RHCOS per version #869
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
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: YuviGold The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
approved
YuviGold
force-pushed
the
MGMT-3353-multi-rhcos
branch
3 times, most recently
from
ebd1ae3
to
c7b532f
Compare
openshift-ci-robot
requested review from
avishayt,
djzager,
filanov and
ronniel1
avishayt
reviewed
Jan 5, 2021
cmd/main.go
Outdated
| }), "Failed uploading boot files") | ||
| for version := range openshiftVersionsMap { | ||
| go func(version string) { | ||
| failOnError(baseISOUploadLeader.RunWithLeader(context.Background(), func() error { |
There was a problem hiding this comment.
It would be nice to have a leader per version and parallelize the uploads, but that's for another PR
Comment on lines
+58
to
+60
| DoAllBootFilesExist(ctx context.Context, isoObjectName string) (bool, error) | ||
| DownloadBootFile(ctx context.Context, isoObjectName, fileType string) (io.ReadCloser, string, int64, error) | ||
| GetS3BootFileURL(isoObjectName, fileType string) string |
There was a problem hiding this comment.
Maybe it would be nicer to have openshiftVersion as the parameter instead of isoObjectName?
There was a problem hiding this comment.
I think it's much flexible to have the ISO received as a parameter, as been done for the rest of the boot functions.
Comment on lines
2
to
13
| "4.6": { | ||
| "release_image": "quay.io/openshift-release-dev/ocp-release:4.6.8-x86_64" | ||
| "display_name": "4.6.8", | ||
| "release_image": "quay.io/openshift-release-dev/ocp-release:4.6.8-x86_64", | ||
| "rhcos_image": "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso", | ||
| "support_level": "production" | ||
| }, | ||
| "4.7": { | ||
| "release_image": "quay.io/openshift-release-dev/ocp-release@sha256:2419f9cd3ea9bd114764855653012e305ade2527210d332bfdd6dbdae538bd66" | ||
| "display_name": "4.7-pre-release", | ||
| "release_image": "quay.io/openshift-release-dev/ocp-release@sha256:2419f9cd3ea9bd114764855653012e305ade2527210d332bfdd6dbdae538bd66", | ||
| "rhcos_image": "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso", | ||
| "support_level": "beta" | ||
| } |
There was a problem hiding this comment.
@ErezAlster We are all set on metrics right? (We should always have the openshift version)
There was a problem hiding this comment.
yes, @oshercc took care for it :)
Enhancing the OPENSHIFT_VERSIONS hashmap to hold rhcos image, display name and support level. Updating everywhere in the code to use RHCOS image matching the cluster OCP version. Including - DownloadBootFiles and CreateISOAndUploadToS3 operations. The name of the baseIso is received from new function s3wrapper.GetBaseIsoObject. For k8s it would be rhcos-<ocp_version>.iso and for onprem it will be for now livecd.iso until updating onprem livecd volume to support a directory of livecds.
YuviGold
force-pushed
the
MGMT-3353-multi-rhcos
branch
from
c7b532f
to
31056e6
Compare
2 tasks
|
/lgtm |
osherdp
pushed a commit
to osherdp/assisted-service
that referenced
this pull request
Jan 16, 2022
Enhancing the OPENSHIFT_VERSIONS hashmap to hold rhcos image, display name and support level. Updating everywhere in the code to use RHCOS image matching the cluster OCP version. Including - DownloadBootFiles and CreateISOAndUploadToS3 operations. The name of the baseIso is received from new function s3wrapper.GetBaseIsoObject. For k8s it would be rhcos-<ocp_version>.iso and for onprem it will be for now livecd.iso until updating onprem livecd volume to support a directory of livecds.
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.
Enhancing the
OPENSHIFT_VERSIONShashmap to hold rhcos image,display name and support level.
i.e.
{ "4.6": { "display_name": "4.6.8", "release_image": "quay.io/openshift-release-dev/ocp-release:4.6.8-x86_64", "rhcos_image": "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso", "support_level": "production" }, "4.7": { "display_name": "4.7-pre-release", "release_image": "quay.io/openshift-release-dev/ocp-release@sha256:2419f9cd3ea9bd114764855653012e305ade2527210d332bfdd6dbdae538bd66", "rhcos_image": "https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.6/4.6.8/rhcos-4.6.8-x86_64-live.x86_64.iso", "support_level": "beta" } }Updating everywhere in the code to use RHCOS image matching the cluster OCP version.
Including -
DownloadBootFilesandCreateISOAndUploadToS3operations.The name of the baseIso is received from new function
s3wrapper.GetBaseIsoObject.For k8s it would be
rhcos-<ocp_version>.isoand for onprem it will be for nowlivecd.isountil updating onprem livecd volume to support a directory of livecds.