mantle/platform/conf: transparently handle Butane spec stabilizations #3422
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Apr 11, 2023
jlebon
previously approved these changes
Apr 11, 2023
|
/retest |
cgwalters
reviewed
Apr 11, 2023
There are three stabilization cases we need to handle: 1. Tests using an experimental Ignition spec that's being stabilized. 2. Tests using an experimental Butane spec that's being stabilized, where the Butane spec already produces a stable Ignition spec. 3. Tests using an experimental Butane spec that's being stabilized, where the Butane spec produces an Ignition spec which is also being stabilized. We already have a procedure for case 1. Ignition configs in tests are stabilized by the PR that lands the new Ignition in fedora-coreos-config, and mantle has code to detect the next stable Ignition spec (otherwise unparsable) and wrap it in an older spec version that mantle does know how to handle. This is good enough for Ignition in the image, and avoids requiring immediate revendoring of the new Ignition into mantle. Implement a similar approach for cases 2 and 3. Butane configs in tests can be stabilized by the PR that updates Ignition in the image. When we see a Butane config with an unrecognized variant/version pair, try stapling "-experimental" onto the spec version and see if we can parse the config. That's sufficient for case 2, but case 3 has the additional complication that Butane's output will no longer be accepted by Ignition in the image. Handle that by stripping "-experimental" from the Ignition config version. (Parsing the result will succeed because of the case 1 workaround.) As a result, revendoring of both Ignition and Butane into mantle can be deferred until convenient, allowing both projects to be updated simultaneously once the new Butane release is out. This is important because there's generally a delay between the two releases, and the previous Butane version will depend on API that's missing from the new Ignition version. Fixes coreos/butane#451.
Use a message similar to the new ones for Butane configs.
|
Okay, should be ready now! |
|
Prow timed out, but I think for this CoreOS CI is sufficient. /override ci/prow/rhcos |
|
@jlebon: Overrode contexts on behalf of jlebon: ci/prow/rhcos In response to this:
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. |
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.
There are three stabilization cases we need to handle:
We already have a procedure for case 1. Ignition configs in tests are stabilized by the PR that lands the new Ignition in fedora-coreos-config, and mantle has code to detect the next stable Ignition spec (otherwise unparsable) and wrap it in an older spec version that mantle does know how to handle. This is good enough for Ignition in the image, and avoids requiring immediate revendoring of the new Ignition into mantle.
Implement a similar approach for cases 2 and 3. Butane configs in tests can be stabilized by the PR that updates Ignition in the image. When we see a Butane config with an unrecognized variant/version pair, try stapling
-experimentalonto the spec version and see if we can parse the config. That's sufficient for case 2, but case 3 has the additional complication that Butane's output will no longer be accepted by Ignition in the image. Handle that by stripping-experimentalfrom the Ignition config version. (Parsing the result will succeed because of the case 1 workaround.)As a result, revendoring of both Ignition and Butane into mantle can be deferred until convenient, allowing both projects to be updated simultaneously once the new Butane release is out. This is important because there's generally a delay between the two releases, and the previous Butane version will depend on API that's missing from the new Ignition version.
Fixes coreos/butane#451.