Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

COS-2692: Add new variants to enable pure CentOS Stream/RHEL CoreOS builds, add Containerfile for layered OKD/OCP builds #1445

Merged
merged 3 commits into from
May 29, 2024
Merged

COS-2692: Add new variants to enable pure CentOS Stream/RHEL CoreOS builds, add Containerfile for layered OKD/OCP builds #1445

merged 3 commits into from
May 29, 2024
+379 −201

Commits on May 24, 2024

  1. Add new okd-c9s and ocp-rhel-9.4 variants 

    To make introducing the base RHCOS/SCOS images safer, let's create two
new variants: `okd-c9s` and `ocp-rhel-9.4`. These variants are cloned
from the existing `c9s` and `rhel-9.4` variants to start.

The new variants will track the status quo: building SCOS/RHCOS with the
OpenShift components baked in (hence the `okd`/`ocp` prefixes). This is
what the pipeline will keep building.

Meanwhile, what is currently the `c9s` and rhel-9.4` variants will
become the new base SCOS/RHCOS streams containing *purely* CentOS
Stream/RHEL content.

The default variant is still `ocp-rhel-9.4` for now.
    @jlebon
    jlebon committed May 24, 2024
    Configuration menu
    Copy the full SHA
    2474419 View commit details
    Browse the repository at this point in the history

  2. Make c9s and rhel-9.4 variants be pure C9S/RHEL 9.4 content 

    This is the second step now in this switcheroo dance (see previous
commit). We make the `c9s` and `rhel-9.4` variants contain only C9S/
RHEL 9.4 content and then make the `okd-c9s` and `ocp-rhel-9.4` variants
inherit from those and add the OCP-specific stuff.
    @jlebon
    jlebon committed May 24, 2024
    Configuration menu
    Copy the full SHA
    4e09d27 View commit details
    Browse the repository at this point in the history

  3. Containerfile: new file 

    This Containerfile allows us to build the OpenShift node image on top
of the base RHCOS/SCOS image (i.e. built from the `c9s` or `rhel-9.4`
image).

Currently, the resulting image is at parity with the base image you'd
get from building the `okd-c9s` or `ocp-rhel-9.4` variant. In the
future, those variants will go away and this will become the only way to
build the node image.

Part of: openshift#799
    @jlebon
    jlebon committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ab82a16 View commit details
    Browse the repository at this point in the history