Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull layering/ changes to go modules #3126

Closed
wants to merge 3 commits into from
Closed

Pull layering/ changes to go modules #3126

wants to merge 3 commits into from

Commits on May 3, 2022

  1. Update vendoring github.com/coreos/fcct → github.com/coreos/butane 

    Prep for using Butane APIs more directly as part of the layering
work.

The logic is also a bit reworked to generate a single Butane fragment
which we convert to Ignition in one go, instead of converting
butane into ignition repeatedly and using config merging.

There's only one wrinkle with doing this, which is that today in
the templates we have multiple files which are drop-ins for `crio.service`;
and we need to group those together.

(I think it would be cleaner to have them in a single file in the
 templates, but for clarity let's handle this)
    @cgwalters
    cgwalters committed May 3, 2022
    Configuration menu
    Copy the full SHA
    ccbecad View commit details
    Browse the repository at this point in the history

  2. vendor: Cherry pick butane patch for compression 

    See coreos/butane#341

This obviates coreos/ignition#1329
which we are carrying currently.
    @cgwalters
    cgwalters committed May 3, 2022
    Configuration menu
    Copy the full SHA
    765e1f7 View commit details
    Browse the repository at this point in the history

  3. controller: Deduplicate NewIgnFileBytesOverwriting code 

    I don't know why I copy/pasted instead originally instead of just
having this call `NewIgnFileBytes()`.
    @cgwalters
    cgwalters committed May 3, 2022
    Configuration menu
    Copy the full SHA
    8dce9a8 View commit details
    Browse the repository at this point in the history