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

Move ignition functions into Containerfiles #21778

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

baude
Copy link
Member

@baude baude commented Feb 21, 2024

We used to use ignition to perform any customization required for podman machine because our input was a generic FCOS image. Now that we are building our own images, some of this customization can be migrated to the Containerfile itself and be less of a burden in our code at boot up.

At the time of this PR, the Containerfile can be found at https://github.com/baude/podman-machine-images/tree/main. It is only present for a so-called daily image. There is little liklihood that this would the final location for the Containerfile so consider it a working version only.

Note: the change to the pull image name is so PRs are not immediately broken that are already in the queue.

[NO NEW TESTS REQUIRED]

Does this PR introduce a user-facing change?

None

Copy link
Contributor

openshift-ci bot commented Feb 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude

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 Feb 21, 2024
@mheon
Copy link
Member

mheon commented Feb 21, 2024

LGTM

@baude baude marked this pull request as draft February 21, 2024 21:48
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 21, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 23, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 26, 2024
@baude
Copy link
Member Author

baude commented Feb 26, 2024

depends on #21765

@rhatdan
Copy link
Member

rhatdan commented Feb 27, 2024

LGTM

@baude baude force-pushed the removeignition branch 2 times, most recently from eaf2c34 to 845acda Compare February 28, 2024 15:28
@mheon
Copy link
Member

mheon commented Feb 28, 2024

Should this have a 5.0 label?

contrib/cirrus/mac_setup.sh Outdated Show resolved Hide resolved
contrib/cirrus/win-podman-machine-test.ps1 Outdated Show resolved Hide resolved
@baude baude force-pushed the removeignition branch 3 times, most recently from c6d726f to d8749ae Compare February 28, 2024 18:19
contrib/cirrus/mac_setup.sh Outdated Show resolved Hide resolved
@baude baude marked this pull request as ready for review February 28, 2024 19:18
@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 Feb 28, 2024
@edsantiago
Copy link
Member

Failure is #21845

  Error: unable to clean up gvproxy: checking if process running: input/output error

I choose not to restart, because I want that flake to get some attention

@mheon
Copy link
Member

mheon commented Feb 28, 2024

Should this have a 5.0 label?

@mheon
Copy link
Member

mheon commented Feb 28, 2024

Nevermind it does, I need coffee

@mheon
Copy link
Member

mheon commented Feb 28, 2024

Code LGTM

@mheon
Copy link
Member

mheon commented Feb 28, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 28, 2024
We used to use ignition to perform any customization required for podman
machine because our input was a generic FCOS image.  Now that we are
building our own images, some of this customization can be migrated to
the Containerfile itself and be less of a burden in our code at boot up.

At the time of this PR, the Containerfile can be found at
https://github.com/baude/podman-machine-images/tree/main.  It is only
present for a so-called daily image.  There is little liklihood that
this would the final location for the Containerfile so consider it a
working version only.

Split WSL and rest apart in the e2e tests so we no longer ppull the
generic FCOS image for testing.

Note: the change to the pull image name is so PRs are not immediately
broken that are already in the queue.

[NO NEW TESTS REQUIRED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
Copy link

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

@TomSweeneyRedHat
Copy link
Member

LGTM

@TomSweeneyRedHat
Copy link
Member

/lgtm
/hold # cancel when tests are hip

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Feb 28, 2024
@mheon
Copy link
Member

mheon commented Feb 29, 2024

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 29, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 12b8cc8 into containers:main Feb 29, 2024
92 of 93 checks passed
@Luap99 Luap99 mentioned this pull request Mar 4, 2024
9 tasks
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label May 30, 2024
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators May 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
5.0 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.

8 participants