helm charts: merge master into helm-charts branch#14049
Merged
valentijnscholten merged 10000 commits intoDefectDojo:helm-chartsfrom Feb 4, 2026
Merged
helm charts: merge master into helm-charts branch#14049valentijnscholten merged 10000 commits intoDefectDojo:helm-chartsfrom
valentijnscholten merged 10000 commits intoDefectDojo:helm-chartsfrom
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR merges the
masterbranch into thehelm-chartswhile making sure the helm chart files are all preserved including their history/commits.The reason for this PR being so big is that the
helm-chartdiverted frommasterin 2017. I think it's good to do this merge to make thehelm-chartsbranch more in sync withmaster. Maybe at some point we need to add a step to the release process to this "merge back" after every release (unless we split off the helm-chart into its own repo).With this branch checked out the helm chart files look OK, as well as the history. Also the github workflows now have the current content, which is maybe the prime reason for this PR.
This PR comes intead of #13425 which at the time of writing cannot be viewed on github.com. Maybe it's to big/complex or has too many conflicts?