Skip to content

Conversation

@valentijnscholten
Copy link
Member

@valentijnscholten valentijnscholten commented Jan 6, 2026

The helm-charts branch is a couple of years behind master, this PR rebases the branch to make it up-to-date again. This can be important for github actions etc.

Option to get it back in sync:

  1. Merge master into helm-charts
    This was tried in fix(helm): replace current helm-charts #13425 but resulted in a huge PR with 4042 changed files. At the time of writing it cannot always be viewed on Github.com, possibly because it's too big

  2. Merge helm-charts into master (and then back into helm-charts).
    I tried this, but this results in 200 conflicted files.

  3. Rebase helm-charts "from" `master".
    This is what this PR does. It looks pretty clean, no conflicts, only 1 file changed.

In theory after this rebase we could merge helm-charts cleanly into master. But that would give 1268 helm chart commits on master which might not make sense. I think option 3 (this PR) is the safest way to ensure the helm-charts branch catches up on 2+ years of changes from master.

@valentijnscholten valentijnscholten changed the base branch from master to helm-charts January 6, 2026 21:25
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.

1 participant