Butane merge v2 by prestist · Pull Request #2235 · coreos/ignition

prestist · 2026-06-11T13:13:45Z

The implementation is broken into six commits; reproducible via a shell script (https://gist.github.com/prestist/c3bfc2f3e2050b2d63a2ebb0f64bd066):

History-preserving merge: Butane files are first moved into a butane/ subdirectory in a prep branch, then merged into Ignition via git merge --allow-unrelated-histories. This preserves full git history so git blame and git log --follow work correctly for all butane/ files.
Cleanup: Butane's repo-level files are removed (go.mod, go.sum, vendor/, .github/, .copr/, linter configs) since these are now handled by Ignition's equivalents.
Import path rewrite: All Go imports across ~150 files are rewritten from github.com/coreos/butane/ to github.com/coreos/ignition/v2/butane/ to work under Ignition's single Go module. Butane's unique dependencies (clarketm/json, go-systemd v22.7.0) are added to go.mod. A license header typo in Butane files is also fixed.
Re-vendor: A single unified vendor/ directory replaces the two separate ones.
config.Parse() integration: Ignition's config.Parse() function -- the single entry point used by all 30+ cloud providers, ignition-validate, ignition-apply, and referenced/merged configs -- is modified to try Ignition JSON first, then fall back to Butane YAML transpilation via butane/config.TranslateBytes(). On both failures, the original Ignition error is returned for backward compatibility. Unit tests cover JSON parsing, Butane YAML parsing (with and without content), invalid input, and source: local failure. The deprecated unit.Deserialize call is updated to unit.DeserializeOptions for the go-systemd v22.7.0 bump.
Build and CI updates: The top-level ./build script sources butane/build to produce the butane binary and restores CGO_ENABLED=1 afterward (Butane sets it to 0, but Ignition requires cgo for libblkid). butane/build is updated to use the new module path. The ./test script adds butane/ to license header checks. The Makefile installs the butane binary. Eight errcheck lint issues in Butane code are fixed. Butane's TMT tests are removed to avoid conflicts with Ignition's TMT plan discovery.

Release Butane 0.22.0

Sync with coreos/repo-templates@91391bc.

Sync repo templates ⚙

Sync with coreos/repo-templates@eb62991.

Sync repo templates ⚙

Sync with coreos/repo-templates@d8980f4.

Sync repo templates ⚙

Sync with coreos/repo-templates@9066203.

Sync repo templates ⚙

- Use "layout" in the context path for errors related to the layout entry in the boot_device configuration. - Add tests for those error cases. - Refactor mirror boot_device check for s390x. Fixes: coreos/butane#484

For fcos 1.6.0-exp & openshift 4.18.0-exp specs, expected to be based on stable 3.5.0 spec. See: coreos#1693 See: coreos/fedora-coreos-tracker#1708

add: Support LUKS encryption using IBM CEX secure keys on s390x

Sync with coreos/repo-templates@7f596dd.

Sync repo templates ⚙

see: coreos/fedora-coreos-tracker#1695

Ignition spec bump

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…-tests */translate_test: Do not pre-compute compressed data

Revert v4_22 to base/v0_6 (Ignition 3.5.0). Fix generated docs for storage.trees on openshift 4.21–4.22 and adjust setuid transform bounds for the 4.23 experimental spec.

OCP 4.22 MCO does not support Ignition spec 3.6.0 produced by Butane openshift 4.22.0

This reverts commit 10436b9, reversing changes made to 5d1a6d7.

PeaceRebel · 2026-06-26T19:21:38Z

So far LGTM. No changes in CI jobs? How does the packaging change with this?

Extended permissions for `storage.trees` were added in coreos/butane#644 to the base 0.7-exp spec. The openshift 4.21 spec was stabilized on the fcos 1.6 & base 0.6 spec, thus it did not include support for those. Unfortunately, we missed that in coreos/butane#674.

OpenShift 4.22's Machine Config Operator does not fully support Ignition 3.6.0 yet (OCPBUGS-90256). Move v4_22 back to base/v0_6 and fcos/v1_6 and ignition/v3_5. We are doing this breaking change in a minor release as the stabilized spec that was released was unfortunately not working and thus there should be no configuration from this spec in use so far. What was moved back: - Permissions for `storage.trees` not available in openshift 4.22 (depends on base/v0_7 & fcos/v1_7, see: coreos/butane#644) - Remove support for special mode bits (ignition/v3_6, see https://coreos.github.io/ignition/migrating-configs/#from-version-350-to-360) Fixes: coreos/butane#704 Fixes: https://redhat.atlassian.net/browse/OCPBUGS-90256

- Note dependency on base 0.7 for storage.trees permissions - Note dependency on external MCO support for GRUB config See: coreos/butane#719

Revert "Merge pull request coreos#717 from coreos/update-4.22"

docs/release-notes: update for release v0.29.0

prestist · 2026-07-07T20:44:56Z

So far LGTM. No changes in CI jobs? How does the packaging change with this?

We discussed this in the last fcos meeting, the details can be seen in the change request.

Move all Butane source code, docs, tests, build scripts, and CI configuration into a butane/ subdirectory in preparation for merging into the Ignition repository via git merge --allow-unrelated-histories. Related: coreos/fedora-coreos-tracker#2006

Merge the full Butane repository (github.com/coreos/butane) into the butane/ subdirectory via git merge --allow-unrelated-histories, after moving all Butane files into a butane/ subdirectory in the source repo. This preserves complete Git history with proper rename tracking, so git blame and git log --follow work correctly for all butane/ files. Related: coreos/fedora-coreos-tracker#2006

Remove files from the butane/ subtree that are repo-level concerns now handled by ignition: go.mod, go.sum, vendor/, CI workflows, packaging configs, linter configs, and AI agent files. The actual source code, docs, build scripts, tests, and opencode skills are preserved.

Rewrite all internal Butane import paths from github.com/coreos/butane/ to github.com/coreos/ignition/v2/butane/ so that Butane's code is part of the single Ignition Go module. Add github.com/clarketm/json as a new dependency required by Butane, and bump go-systemd to v22.7.0. Also fix stray ')' in license headers across Butane files.

Teach Ignition's config parser to accept Butane YAML configs in addition to Ignition JSON. Parse() now tries Ignition JSON first and, on failure, attempts to transpile the input as a Butane config using the integrated butane/ library. This allows users to provide Butane configs directly to instances without a separate transpilation step. Key design decisions: - JSON is tried first for zero behavioral change on existing configs - On both failures, the original Ignition error is returned - source: local properly errors since FilesDir is unavailable at boot - OpenShift variant configs produce MachineConfig YAML which fails Ignition parsing, as those configs go through MCO Related: coreos/fedora-coreos-tracker#2006

- build: Source butane/build to produce butane binary, restore CGO_ENABLED=1 - butane/build: Use module path, accept VERSION from parent - test: Add butane/ to license header check paths - Makefile: Install butane binary to /usr/bin - config: Add unit tests for Butane YAML parsing - config: Use DeserializeOptions (go-systemd v22.7.0) - butane: Fix errcheck lint issues - butane: Remove TMT tests (conflict with ignition TMT discovery)

coderabbitai · 2026-07-13T20:03:12Z

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Enterprise

Run ID: c5102862-8848-4cd7-821f-ddb6e1f0010c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

_{Comment @coderabbitai help to get the list of available commands.}

github-actions · 2026-07-13T20:04:57Z

Binary size report (`bin/amd64/ignition`)

	Size
Base (`main`)	21MiB
PR (#2235)	33MiB
Delta	+13MiB (61.00%)

Remove Butane test cases that reference ErrZeroesWithShouldNotExist, a validation that was deliberately removed from Ignition in commit 76f869a (stages/disks: Allow deleting a partition while creating number 0). The validation was originally present in Ignition but was removed because partition numbers are now resolved to their final values, making the check unnecessary. Butane's vendored copy of Ignition still had this validation, but after merging into Ignition proper, the test cases reference the real errors package which no longer defines this constant.

yasminvalim and others added 30 commits September 20, 2024 12:32

Merge pull request coreos#548 from yasminvalim/release-0.22.0

6d2ec2d

Release Butane 0.22.0

Sync repo templates ⚙

08303ab

Sync with coreos/repo-templates@91391bc.

Merge pull request coreos#549 from coreosbot-releng/repo-templates

ed9e750

Sync repo templates ⚙

Sync repo templates ⚙

1135e9e

Sync with coreos/repo-templates@eb62991.

Merge pull request coreos#552 from coreosbot-releng/repo-templates

266422d

Sync repo templates ⚙

Sync repo templates ⚙

de67188

Sync with coreos/repo-templates@d8980f4.

Merge pull request coreos#553 from coreosbot-releng/repo-templates

2ca6b36

Sync repo templates ⚙

Sync repo templates ⚙

9f99012

Sync with coreos/repo-templates@9066203.

Merge pull request coreos#557 from coreosbot-releng/repo-templates

40fa2dd

Sync repo templates ⚙

fcos/1.6.0-exp: Fix context for boot_device.layout errors

6531c7f

- Use "layout" in the context path for errors related to the layout entry in the boot_device configuration. - Add tests for those error cases. - Refactor mirror boot_device check for s390x. Fixes: coreos/butane#484

vendor: Update ignition/v2 v2.19.0 & aws-sdk-go v1.53.5

50dff55

Support LUKS encryption using IBM CEX secure keys on s390x

5862ae0

For fcos 1.6.0-exp & openshift 4.18.0-exp specs, expected to be based on stable 3.5.0 spec. See: coreos#1693 See: coreos/fedora-coreos-tracker#1708

Merge pull request coreos#536 from madhu-pillai/test_cex

da4b8a1

add: Support LUKS encryption using IBM CEX secure keys on s390x

mod: revendor latest ignition, stabilize 3.5

e37ee9c

Sync repo templates ⚙

a6374ff

Sync with coreos/repo-templates@7f596dd.

Merge pull request coreos#561 from coreosbot-releng/repo-templates

6d5cf89

Sync repo templates ⚙

docs: run generate with new ignition import

72550e5

Dockerfile: update to Fedora 41

9a6a9d8

see: coreos/fedora-coreos-tracker#1695

Merge pull request coreos#562 from prestist/ignition-spec-bump

011bb0c

Ignition spec bump

base: copy v0_6_exp to v0_7_exp

66c2a31

base/v0_7_exp: update imports and package names

67d33f0

mod: re-vendor to bring in new v3_6_exp type

fba29d0

base/v0_6: stabilize v0_6_exp to v0_6

0d098ca

fcos: copy v1_6_exp to v1_7_exp

97194bc

fcos/v1_7_exp: update imports and package names

969d811

fcos/v1_6: stabilize v1_6_exp to v1_6

08d0764

fiot/v1_1_exp: update import to new base/v0_7_exp

65b9bff

flatcar/v1_2_exp: update import to new base/v0_7_exp

04d1887

r4e/v1_2_exp: update import to new base/v0_7_exp

95fb547

prestist force-pushed the butane-merge-v2 branch from 39f3d38 to b4a8fee Compare June 11, 2026 15:12

Merge pull request coreos#713 from angelcerveraroldan/fix-compression…

87d88f9

…-tests */translate_test: Do not pre-compute compressed data

prestist force-pushed the butane-merge-v2 branch from b4a8fee to 0308784 Compare June 17, 2026 17:21

This was referenced Jun 18, 2026

butane: import as git subtree (alternative to #2235) #2237

Closed

Allow passing in Butane configs directly to instances coreos/fedora-coreos-tracker#2006

Open

yasminvalim added 3 commits June 24, 2026 09:50

openshift/v4_22: roll back to Ignition spec 3.5.0

5d1a6d7

Revert v4_22 to base/v0_6 (Ignition 3.5.0). Fix generated docs for storage.trees on openshift 4.21–4.22 and adjust setuid transform bounds for the 4.23 experimental spec.

Merge pull request coreos#717 from coreos/update-4.22

10436b9

OCP 4.22 MCO does not support Ignition spec 3.6.0 produced by Butane openshift 4.22.0

Revert: Merge pull request coreos#717 from coreos/update-4.22

418bd5d

This reverts commit 10436b9, reversing changes made to 5d1a6d7.

yasminvalim and others added 6 commits June 29, 2026 19:42

internal/doc/butane: Add some notes about support

890b8f9

- Note dependency on base 0.7 for storage.trees permissions - Note dependency on external MCO support for GRUB config See: coreos/butane#719

Merge pull request coreos#718 from yasminvalim/revert-717-changes

202e190

Revert "Merge pull request coreos#717 from coreos/update-4.22"

docs/release-notes: update for release v0.29.0

44a4173

Merge pull request #721 from coreos/pre-release-v0.29.0

7effcdc

docs/release-notes: update for release v0.29.0

prestist added 7 commits July 13, 2026 16:01

*: re-vendor after butane merge

8b496f7

prestist force-pushed the butane-merge-v2 branch from 0308784 to 8534157 Compare July 13, 2026 20:03

prestist force-pushed the butane-merge-v2 branch from 11d3e14 to 9e45e0c Compare July 14, 2026 14:16

docs: add release notes for Butane merge

c30894d

prestist mentioned this pull request Jul 14, 2026

README: update for repository archival coreos/butane#723

Draft

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Butane merge v2#2235

Butane merge v2#2235
prestist wants to merge 1317 commits into
coreos:mainfrom
prestist:butane-merge-v2

prestist commented Jun 11, 2026 •

edited

Loading

Uh oh!

PeaceRebel commented Jun 26, 2026

Uh oh!

prestist commented Jul 7, 2026

Uh oh!

coderabbitai Bot commented Jul 13, 2026 •

edited

Loading

Review skipped

Uh oh!

github-actions Bot commented Jul 13, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Uh oh!

Conversation

prestist commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PeaceRebel commented Jun 26, 2026

Uh oh!

prestist commented Jul 7, 2026

Uh oh!

coderabbitai Bot commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

github-actions Bot commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Binary size report (bin/amd64/ignition)

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

prestist commented Jun 11, 2026 •

edited

Loading

coderabbitai Bot commented Jul 13, 2026 •

edited

Loading

github-actions Bot commented Jul 13, 2026 •

edited

Loading

Binary size report (`bin/amd64/ignition`)