Skip to content

Add helm chart in tree (backport #312) - #313

Closed
mergify[bot] wants to merge 2 commits into
release-0.2from
mergify/bp/release-0.2/pr-312
Closed

mergify[bot] wants to merge 2 commits into
release-0.2from
mergify/bp/release-0.2/pr-312

Conversation

@mergify

@mergify mergify Bot commented Nov 16, 2026

Copy link
Copy Markdown

Commit the helm chart in tree to make it reviewable based on the commit sha


This is an automatic backport of pull request #312 done by Mergify.

Keeping generated CRDs and templates in Git makes chart changes reviewable
and lets users inspect chart contents at a commit without running the
generator. Dependency archives remain local; they come from the in-tree
CRD chart.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
(cherry picked from commit 5b803ba)

# Conflicts:
#	.gitignore
Regenerate the chart in the existing generated-file check so stale
templates fail CI. Also detect new chart files, which git diff misses.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>
(cherry picked from commit 1d6c61c)
@mergify mergify Bot added the conflicts label Nov 16, 2026
@mergify

mergify Bot commented Nov 16, 2026

Copy link
Copy Markdown
Author

Cherry-pick of 5b803ba has failed:

On branch mergify/bp/release-0.2/pr-312
Your branch is up to date with 'origin/release-0.2'.

You are currently cherry-picking commit 5b803ba.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CONTRIBUTING.md
	new file:   chart/bootc-operator-crds/templates/node.bootc.dev_bootcnodepools.yaml
	new file:   chart/bootc-operator-crds/templates/node.bootc.dev_bootcnodes.yaml
	new file:   chart/bootc-operator-crds/templates/node.bootc.dev_bootcoperatorconfigs.yaml
	new file:   chart/bootc-operator/templates/controller-clusterrole.yaml
	new file:   chart/bootc-operator/templates/controller-clusterrolebinding.yaml
	new file:   chart/bootc-operator/templates/controller-deployment.yaml
	new file:   chart/bootc-operator/templates/controller-role.yaml
	new file:   chart/bootc-operator/templates/controller-rolebinding.yaml
	new file:   chart/bootc-operator/templates/controller-serviceaccount.yaml
	new file:   chart/bootc-operator/templates/daemon-clusterrole.yaml
	new file:   chart/bootc-operator/templates/daemon-clusterrolebinding.yaml
	new file:   chart/bootc-operator/templates/daemon-daemonset.yaml
	new file:   chart/bootc-operator/templates/daemon-serviceaccount.yaml
	new file:   chart/bootc-operator/templates/leader-election-role.yaml
	new file:   chart/bootc-operator/templates/leader-election-rolebinding.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .gitignore

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot mentioned this pull request Nov 16, 2026
@alicefr alicefr closed this Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant