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.

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

Create pkg/machine/ignition package #20692

Merged
merged 2 commits into from
Jan 4, 2024

Conversation

jakecorrenti
Copy link
Member

@jakecorrenti jakecorrenti commented Nov 14, 2023

Moves all of the ignition files out of the machine package and into its own called ignition. This required VMType to get moved out of the machine package and into the define package in order to prevent a circular dependency.

Also uses the systemd parser UnitFile type to compose unit files instead of having hard-coded strings scattered around the files.

Does this PR introduce a user-facing change?

None

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none labels Nov 14, 2023
Copy link

Cockpit tests failed for commit eea255da6c91e08f8024e9e8e5f66c18d9860771. @martinpitt, @jelly, @mvollmer please check.

@jakecorrenti jakecorrenti force-pushed the ignition-pkg branch 8 times, most recently from f0bfaa5 to 2b25beb Compare November 16, 2023 23:08
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 19, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2023
Copy link

Ephemeral COPR build failed. @containers/packit-build please check.

@jakecorrenti jakecorrenti force-pushed the ignition-pkg branch 2 times, most recently from c7aba47 to e06ef85 Compare November 30, 2023 20:13
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2023
@jakecorrenti jakecorrenti changed the title [WIP] Create pkg/machine/ignition package Create pkg/machine/ignition package Nov 30, 2023
@jakecorrenti jakecorrenti marked this pull request as ready for review November 30, 2023 23:42
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 30, 2023
@jakecorrenti
Copy link
Member Author

@baude @ashley-cui PTAL

@rhatdan
Copy link
Member

rhatdan commented Dec 5, 2023

LGTM
@baude @mheon @vrothberg @giuseppe PTAL
/approve

Copy link
Contributor

openshift-ci bot commented Dec 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jakecorrenti, rhatdan

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 10, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2023
@jakecorrenti jakecorrenti force-pushed the ignition-pkg branch 2 times, most recently from 20c1924 to 4273de0 Compare January 2, 2024 18:29
@rhatdan
Copy link
Member

rhatdan commented Jan 2, 2024

@jakecorrenti
Copy link
Member Author

still trying to narrow down what's causing these errors, so apologies for the loads of pushes. the errors only turned up after the rebase...

@jakecorrenti jakecorrenti force-pushed the ignition-pkg branch 2 times, most recently from 3b8cf9f to ee74907 Compare January 3, 2024 22:26
@jakecorrenti
Copy link
Member Author

jakecorrenti commented Jan 4, 2024

both failures seem to be unrelated

Moves all of the ignitionfiles out of the `machine` package and into
its own called `ignition`. This required `VMType` to get moved out of
the `machine` package and into the `define` package in order to prevent
a circular dependency.

Signed-off-by: Jake Correnti <[email protected]>
Uses the systemd unit file parser to build unit files instead of having
them be just blocks of hard-coded strings.

Signed-off-by: Jake Correnti <[email protected]>
@baude
Copy link
Member

baude commented Jan 4, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 753bdc3 into containers:main Jan 4, 2024
91 of 92 checks passed
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Apr 4, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. machine release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants