Pull layering/ changes to go modules #3126
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Hmm...butane fix didn't work. I think it's because we're not actually using butane config merging, we're doing Ignition config merging. Clearly we need a unit test so this doesn't just fail in e2es which are much more expensive to run. |
cgwalters
force-pushed
the
layering-godeps
branch
from
6dede05
to
7eb9b5c
Compare
|
OK I rebased this on #3128 - let's get that one in first. |
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)
See coreos/butane#341 This obviates coreos/ignition#1329 which we are carrying currently.
|
OK cool, #3128 made it in, so rebased 🏄 and I also snuck in one small further fix. |
I don't know why I copy/pasted instead originally instead of just having this call `NewIgnFileBytes()`.
|
Eh actually of course go will remove unused dependencies so I can't quite cherry pick the layering deps right now. |
|
@cgwalters: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
Will revisit this separately |
There's a big pile of conflicts on the go modules
go.modandvendor/etc. between master and layering. I've cherry picked the bits we need, which should help us keep the layering branch up to date.IMPORTANT - this PR cherry picks coreos/butane#341 - so that change will currently need to be manually reapplied after any
go mod vendoruntil it merges. This replaces the not-going-to-be upstream Ignition patch.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)
vendor: Cherry pick butane patch for compression
See coreos/butane#341
This obviates coreos/ignition#1329
which we are carrying currently.
make go-deps && make update
A lot of this is version bumps, but go-containerregistry (the thing I used to create my tiny machineconfig wrapper images without a docker build) additionally drags in the following dependencies that nothing else uses:
This isn't terrible, so I'm leaving it for now since it works, but
at some point this might get obviated by buildah or something