coreos / coreos/coreos-assembler

branching strategy for COSA for Openshift

Open
#4,080 5 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Dominant language
Go
Stars
393
Forks
193
Avg merge
17h 6m
Merged PRs (30d)
5

Description

Typically we have branched COSA everytime we branch for a new OCP release. i.e. the rhcos-4.18 branch is for OCP 4.18 builds.

This has served us well, but we are moving in OpenShift to a model where we do a base image build that is purely RHEL content and no OCP content and using that rhel content stream (i.e. rhel-9.6) as the input to a layered container build that adds the OCP content.

This means we'll use a base RHEL stream (like rhel-9.6) for multiple versions of Openshift at the same time. Ultimately the branching of COSA might not make sense anymore since there is no 1:1 relationship between RHCOS stream to Openshift release.

We could either:

  1. Stop branching at all and just use latest
  2. Maybe branch differently where we branch for the rhel stream verses an openshift release

With the first option we'd have to be more careful about large changes (like big new features) and with the second option we'd probably need to "backport" a lot of changes from one branch to another as we'd have multiple branches that are essentially latest development streams.

WDYT?

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Review the current COSA branching convention described in this issue, especially the relationship between rhcos-* branches, RHEL content streams, and OpenShift releases. Compare the proposed latest-only and RHEL-stream branching models, then document a decided strategy and its backporting implications as the outcome.

Written by the indexing model from the issue text.

Assessment

Domain
build-system, release
Issue type
Feature
Difficulty
5/5
Estimated time
Over a week
Activity status
Stale
Clarity
Needs clarification
Newbie friendliness
25/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.