adds io.openshift.os.streamclass to OKD OS and extensions images#75759
adds io.openshift.os.streamclass to OKD OS and extensions images#75759cheesesashimi wants to merge 1 commit intoopenshift:mainfrom
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: cheesesashimi The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/pj-rehearse pull-ci-openshift-os-master-okd-scos-images |
|
@cheesesashimi: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@cheesesashimi: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
The code in the PR seems reasonable. The actual string suggested here may be able to be improved. For rhcos 9 and rhcos 10 the string we are using for the stream class is |
To support a singular OS Stream in OKD, we need to add a label to the SCOS 10 image (
io.openshift.os.streamclass). For RHCOS 10, this label is set within the build-node-image.Jenkinsfile. Since the value of this label depends on whether it is an RHCOS 9 or RHCOS 10 image, the value must be set at build-time instead of via the Containerfile. Since OKD will only have one OS Stream (scos-10), we could set it statically in the Containerfile(s) found in http://github.com/openshift/os. However, I think it makes more sense to do it at build-time until there is a better way of setting it dynamically.With the above in mind, this PR accomplishes that by modifying the image targets to be the input for an inline Containerfile which sets this label.