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

common.yaml: stop using initramfs-args in favour of dracut.conf.d dropins #1376

Merged
merged 6 commits into from
Oct 16, 2023

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Sep 28, 2023

The field is deprecated:
coreos/rpm-ostree#3834

See individual commit messages for details.
Closes: #1377

These are all already specified in the `dracut.conf.d` dropins we
inherit from FCOS.

Part of the move away `initramfs-args`, which is deprecated:
coreos/rpm-ostree#3834
Add context links from git archeology while we're here.

Part of the move away `initramfs-args`, which is deprecated:
coreos/rpm-ostree#3834
This dates back from when we wanted to use NetworkManager in the initrd
before it was the default (in RHEL8). It's the default now, so we don't
need it anymore.

Remove related commented-out lines in `common.yaml` while we're here.

Part of the move away `initramfs-args`, which is deprecated:
coreos/rpm-ostree#3834
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 28, 2023
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome series. I assume so but worth verifying: Did you compare the before/after of the lsinitrd?

Also tangentially related to:

It just stops uselessly generating ifcfg files in the initrd.

Could this be related to https://github.com/openshift/machine-config-operator/blob/master/templates/common/_base/files/NetworkManager-clean-initrd-state.yaml which I started to look at and then recoiled in horror and closed the tab...

It's included by default currently so we don't need this. A patch in FCOS
will actually make it so that we don't pull it in at all:
coreos/fedora-coreos-config#2642

Part of the move away `initramfs-args`, which is deprecated:
coreos/rpm-ostree#3834
`ignition` is already pulled in by a multitude of dracut modules, and
`fips` is already pulled in by `rhcos-fips`.

Part of the move away `initramfs-args`, which is deprecated:
coreos/rpm-ostree#3834
The `iscsi` module is already included by default in a non-hostonly
initramfs.

Part of the move away `initramfs-args`, which is deprecated:
coreos/rpm-ostree#3834
@jlebon
Copy link
Member Author

jlebon commented Sep 29, 2023

I hadn't checked closely the diff, but I did now and one thing that jumps out is that ifcfg was still getting pulled in. I opened coreos/fedora-coreos-config#2642 and dracutdevs/dracut#2529 for that and tweaked the commit message of the relevant commit here.

@jlebon
Copy link
Member Author

jlebon commented Sep 29, 2023

To be clear, this needs to wait until coreos/fedora-coreos-config#2640 lands in RHCOS.

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 29, 2023
@jlebon
Copy link
Member Author

jlebon commented Sep 29, 2023

Could this be related to openshift/machine-config-operator@master/templates/common/_base/files/NetworkManager-clean-initrd-state.yaml which I started to look at and then recoiled in horror and closed the tab...

I'm not sure what that script is doing. It seems to be doing something that shouldn't normally be necessary and doesn't talk about how it intersects with the teardown scripts we have and the existing behaviour of not stomping on user configs. Probably deserves a chat with the team that introduced it.

@travier
Copy link
Member

travier commented Oct 2, 2023

/lgtm
/retest

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 2, 2023
@jlebon
Copy link
Member Author

jlebon commented Oct 16, 2023

To be clear, this needs to wait until coreos/fedora-coreos-config#2640 lands in RHCOS.

/hold

This landed as part of #1371.

/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 Oct 16, 2023
@cgwalters
Copy link
Member

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon, travier

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:
  • OWNERS [cgwalters,jlebon,travier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 16, 2023

@jlebon: all tests passed!

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.

@openshift-ci openshift-ci bot merged commit fa37ed3 into openshift:master Oct 16, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

'initramfs-args is deprecated' warning message
3 participants