Add ADR for new KDM branching strategy#4766
Open
rancher-max wants to merge 1 commit intorancher:masterfrom
Open
Add ADR for new KDM branching strategy#4766rancher-max wants to merge 1 commit intorancher:masterfrom
rancher-max wants to merge 1 commit intorancher:masterfrom
Conversation
Signed-off-by: rancher-max <max.ross@suse.com>
rancher-max
requested review from
HarrisonWAffel,
jakefhyde,
kinarashah and
snasovich
cwayne18
approved these changes
Sep 14, 2023
Member
cwayne18
left a comment
cwayne18
left a comment
There was a problem hiding this comment.
Fully on board with this, but obviously will defer to @snasovich @kinarashah and @briandowns et al
matttrach
approved these changes
Sep 14, 2023
Contributor
matttrach
left a comment
matttrach
left a comment
There was a problem hiding this comment.
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.
brandond
requested changes
Sep 15, 2023
|
|
||
| ## 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: |
Member
There was a problem hiding this comment.
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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