-
Notifications
You must be signed in to change notification settings - Fork 1.5k
*: move to Ignition v3 #1468
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.
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
*: move to Ignition v3 #1468
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: runcom If they are not already assigned, you can assign the PR to them by writing The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
/hold This is not going to pass until MCO/RHCOS are done with the move as well @wking @abhinavdahiya @crawford @ashcrow @cgwalters @jlebon @ajeddeloh ptal |
|
Can you split the vendor bump out into a separate commit (like this), so we can more easily review the changes you made without having the changes |
done |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of setting up ign and then, in the append case, immediately clobbering it, I'd rather have:
var ign whateverTypeThisShouldBe
if appendToFile {
ign = ignition.FileAppendFromBytes(strings.TrimSuffix(base, ".template"), "root", mode, data)
} else {
ign = ignition.FileFromBytes(strings.TrimSuffix(base, ".template"), "root", mode, data)
}Or we should update FileFromBytes to support an append parameter, or an options struct parameter, or some such...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, I've already accounted for that, just want to validate that the v3 way of doing append is how I did @ajeddeloh
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah this looks good.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, in the case of appending you'll want to make sure a file entry doesn't already exist at that path. In that case you'll need to add the append entry to it's append list.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, in the case of appending you'll want to make sure a file entry doesn't already exist at that path.
This helper is for our internal use, so we can probably ignore that case. Will Ignition crash and burn if this happens, so we can fail out in CI if by some programmer mistake we have two entries for the same file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ignition will crash and burn at validation time (note: you can call the validation function ahead of time) since there will be two file entries with the same path
pkg/asset/ignition/machine/node.go
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: no need for func.
https://play.golang.org/p/kM-DWZ9yCXN
package main
import (
"fmt"
"net/url"
)
func main() {
u := (&url.URL{
Scheme: "https",
Host: fmt.Sprintf("api.%s:22623", "adahiya-0.tt.testing"),
Path: fmt.Sprintf("/config/%s", "master"),
}).String()
fmt.Println(u)
}
pkg/asset/ignition/machine/node.go
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think that was authored by me. That was authored by @crawford.
|
Would it be possible to add validation (via |
I'm comfortable with e2e suites in CI to cover installer-generated Ignition content. That leaves users who supply their own Ignition files as part of a multi-step install? I'm ok handling that in a separate PR. |
Signed-off-by: Antonio Murdaca <[email protected]>
0ae9143 to
b5dcbf6
Compare
|
/hold |
We put a good amount of work into this and think we can pull it off fairly quickly. |
Signed-off-by: Antonio Murdaca <[email protected]>
Agreed. |
Updating MC* to use ignition v3. The following changes are included: - ssh keys now written to /home/core/.ssh/authorized_keys.d/ignition - code changes to use v3 and remove usage of v2.2.0 - unit and e2e test updates - updated golden files - remove the use of container-linux-config-transpiler in render.go and use v3 types instead Requires: openshift/installer#1468 Closes: openshift#565
|
I realize this is on hold, but when we revive it we need to bump the AWS UPI template too. |
|
@runcom: PR needs rebase. DetailsInstructions 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. |
|
@runcom: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. DetailsInstructions 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. |
|
This looks abandoned. Please feel free to reopen if you think this is still something you would like to pursue /close |
|
@abhinavdahiya: Closed this PR. DetailsIn 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. |
Gopkg.tomlto use a tag (News 2.0.0 coreos/ignition#773)Signed-off-by: Antonio Murdaca [email protected]