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.

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

Add ADR for new KDM branching strategy #4766

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

rancher-max
Copy link
Contributor

Proposed Changes

Proposal to change the way we branch in KDM to allow for k3s/rke2 to have its own branches for rancher versions.

Types of Changes

Verification

Testing

Linked Issues

User-Facing Change


Further Comments

Copy link
Member

@cwayne18 cwayne18 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fully on board with this, but obviously will defer to @snasovich @kinarashah and @briandowns et al

Copy link
Contributor

@matttrach matttrach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sort of breaks my brain, but I can't think of a better way without asking Rancher to change how they ingress this data.
It generally feels like this sort of branching strategy can cause merge pain, but that seems less painful than our current strategy.


## Context

Rancher Manager uses [KDM](https://github.com/rancher/kontainer-driver-metadata/) for its integration of RKE2. This manages the following behaviors for each RKE2 version:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the ADR go here, in KDM, or ecm-distro-tools? This feels like an overarching issue where we want to observe parity for both K3s and RKE2, and the change were discussing doesn't really affect the distro - so I don't feel like it belongs in this repo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants