From 8351e937355f9c303b8486dab8bf1e33c8ab92e2 Mon Sep 17 00:00:00 2001 From: Yoni Bettan Date: Thu, 8 Feb 2024 02:44:31 -0600 Subject: [PATCH] MCO-392: Start using rhel-coreos image rather than machine-os-content. The machine-os-content is deprecated and we'd like to stop shipping it entirely in the release payload. Point the DTK imagestream to the rhel-coreos image instead. Signed-off-by: Yoni Bettan Co-authored-by: Jonathan Lebon --- README.md | 2 +- docs/driver_toolkit_imagestream.md | 4 ++-- manifests/image-references | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4ac21e6..fc4777f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Driver containers are container images used for building and deploying out-of-tr The list of the packages installed in the `DTK` can be found in the [Dockerfile](./Dockerfile). ## Purpose -Prior to the Driver Toolkit's existence, you could install kernel packages in a pod or build config on OpenShift using [entitled builds](https://www.openshift.com/blog/how-to-use-entitled-image-builds-to-build-drivercontainers-with-ubi-on-openshift "entitled builds") or by installing from the kernel RPMs in the hosts `machine-os-content`. The Driver Toolkit simplifies the process by removing the entitlement step, and avoids the privileged operation of accessing the machine-os-content in a pod. The Driver Toolkit can also be used by partners who have access to pre-released OpenShift versions to prebuild driver-containers for their hardware devices for future OpenShift releases. +Prior to the Driver Toolkit's existence, you could install kernel packages in a pod or build config on OpenShift using [entitled builds](https://www.openshift.com/blog/how-to-use-entitled-image-builds-to-build-drivercontainers-with-ubi-on-openshift "entitled builds") or by installing from the kernel RPMs in the hosts `rhel-coreos`. The Driver Toolkit simplifies the process by removing the entitlement step, and avoids the privileged operation of accessing the `rhel-coreos` in a pod. The Driver Toolkit can also be used by partners who have access to pre-released OpenShift versions to prebuild driver-containers for their hardware devices for future OpenShift releases. The Driver Toolkit is also used by the [Kernel Module Management (KMM)](https://github.com/rh-ecosystem-edge/kernel-module-management), which is currently available as a community Operator on OperatorHub. KMM supports out-of-tree and third-party kernel drivers and the support software for the underlying operating system. Users can create _modules_ for KMM to build and deploy a driver container, as well as support software like a device plug-in, or metrics. Modules can include a build config to build a driver container based on the Driver Toolkit, or KMM can deploy a prebuilt driver container. diff --git a/docs/driver_toolkit_imagestream.md b/docs/driver_toolkit_imagestream.md index f77d758..0a84fe9 100644 --- a/docs/driver_toolkit_imagestream.md +++ b/docs/driver_toolkit_imagestream.md @@ -8,5 +8,5 @@ In order to generate such imagestream during the cluster installation, there are * DTK: add an [templated imagestream](../manifests/01-openshift-imagestream.yaml) to the payload. * ART: adding that imagestream to the cluster deployment (templeted) by running `oc adm release new ...`. -* OC: Owning the code for `oc adm release new …` which will scrape the [machine-os-content](https://github.com/openshift/machine-config-operator/blob/master/docs/OSUpgrades.md#os-updates). -* MCO: owns the machine-os-content. +* OC: Owning the code for `oc adm release new …` which will scrape the [rhel-coreos image](https://github.com/openshift/machine-config-operator/blob/master/docs/OSUpgrades.md#os-updates). +* MCO: owns the `rhel-coreos` image. diff --git a/manifests/image-references b/manifests/image-references index 6681362..8b12c3b 100644 --- a/manifests/image-references +++ b/manifests/image-references @@ -6,7 +6,7 @@ spec: from: kind: DockerImage name: example.com/image-reference-placeholder:driver-toolkit - - name: machine-os-content + - name: rhel-coreos from: kind: DockerImage - name: registry.svc.ci.openshift.org/openshift:machine-os-content + name: example.com/image-reference-placeholder:rhel-coreos