Skip to content

Conversation

@LorbusChris
Copy link
Contributor

Adds a dedicated image config for CentOS Stream 9.

oc adm release new and the CVO require the machine-os label to be present on one of the payload images.
For c9s, we let COSA add the required labels to the ostree container image.

In OKD/SCOS, this image is aliased as both machine-os-content and centos-stream-coreos-9 in the payload.

Adds a dedicated image config for CentOS Stream 9.

`oc adm release new` and the CVO require the `machine-os` label to be present
on one of the payload images.
For c9s, we let COSA add the required labels to the ostree container image.

In OKD/SCOS, this image is aliased as both `machine-os-content`
and `centos-stream-coreos-9` in the payload.
@openshift-ci openshift-ci bot requested review from aaradhak and jmarrero January 26, 2023 14:19
@cgwalters
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 26, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 26, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, LorbusChris

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 26, 2023
@travier
Copy link
Member

travier commented Jan 26, 2023

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 26, 2023
@travier
Copy link
Member

travier commented Jan 26, 2023

Have we fixed the issue from #1084 ?

@cgwalters
Copy link
Member

Hmm right no we haven't...this will actually break the current plan to use C9S for OCP temporarily because we haven't aliased machine-os-content there.

Ugh so this all starts to pile up onto digging out of the DTK hole i.e. openshift/driver-toolkit#102 and openshift/driver-toolkit#103 and https://issues.redhat.com/browse/MCO-392

@cgwalters
Copy link
Member

OK well I guess for now we could change the OKD pipeline to do this.

@LorbusChris
Copy link
Contributor Author

@cgwalters afaik DTK in OKD does work with the machine-os labels present on the ostree container (which is aliased as both machine-os-content and centos-stream-coreos-9 in the payload).

Can't OCP 4.13 just stop shipping the legacy container, and start putting the labels on the ostree container, and alias the rhel-coreos images as machine-os-content?

@LorbusChris
Copy link
Contributor Author

Carrying this downstream would be OK for now, too.

@cgwalters
Copy link
Member

Can't OCP 4.13 just stop shipping the legacy container, and start putting the labels on the ostree container, and alias the rhel-coreos images as machine-os-content?

Ummm....I don't know 😄 I would personally certainly be very happy if we do that...

@travier
Copy link
Member

travier commented Jan 27, 2023

OK, once we have #1127, we should be able to merge this one and have SCOS be SCOS again.

@LorbusChris
Copy link
Contributor Author

@travier @cgwalters #1127 has merged, do you think we can unhold and merge this one now?

@travier
Copy link
Member

travier commented Jan 31, 2023

LGTM
/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 1, 2023

@LorbusChris: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 737f9c8 into openshift:master Feb 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants