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

Bump fedora-coreos-config for various fixes #480

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Jan 5, 2021

Specifically,

For the latter, also apply the same || exit 1 change from
coreos/fedora-coreos-config#800 to our own
dracut modules for good measure.

$ git shortlog --invert-grep --author='CoreOS Bot' 6c9f15c8857772f730cdb0b5b2df143e778c5d0d..8c07b7391473910ba3884ee0d3763743805ac78f
Benjamin Gilbert (6):
      40ignition-ostree: silence mkfs.xfs
      coreos-boot-mount-generator: stop mounting /boot/efi
      40ignition-ostree: rename mount_and_restore_filesystem
      40ignition-ostree: create mountpoint in mount_verbose
      40ignition-ostree: add get_partlabels_for_parttype helper
      40ignition-ostree: copy ESP contents as independent filesystems

Dusty Mabe (1):
      overrides: drop graduated overrides

Jonathan Lebon (7):
      40ignition-ostree/transposefs: also trigger udev on by-label link mismatch for ESP
      40ignition-ostree/transposefs: factor out function to restore fs
      40ignition-ostree/transposefs: relabel the root of reprovisioned filesystems
      40ignition-ostree/transposefs: load zram with num_devices=0
      Add rawhide repo file
      05core: re-order and rename some dracut modules
      05core: add `|| exit 1` to `systemctl add-{requires,wants}` calls

Kelvin Fan (1):
      overlay.d/15fcos: Stop utilizing c-l-h-m private dir

Luca BRUNO (1):
      overrides: drop stale Afterburn entries

Micah Abbott (2):
      use WALinuxAgent-udev package for Azure udev rules
      overlay: add new module for installing Azure udev rules

Prashanth Sundararaman (1):
      tests: Enable TPM test for all arches except s390x

Timothée Ravier (1):
      manifests/fedora-coreos-base: Mask systemd-repart

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 5, 2021
systemctl -q --root="$initdir" add-requires ignition-files.service "$unit"
# note we `|| exit 1` here so we error out if e.g. the units are missing
# see https://github.com/coreos/fedora-coreos-config/issues/799
systemctl -q --root="$initdir" add-requires ignition-files.service "$unit" || exit 1
Copy link
Member Author

Choose a reason for hiding this comment

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

I guess this dracut module should technically be re-ordered to 31 at least so it's more obvious that it's after 30ignition. Though the fact that we have || exit 1 here clearly demonstrates that it works fine.

@travier
Copy link
Member

travier commented Jan 5, 2021

We realized a bit late that not mounting the ESP by default currently breaks bootupd. This might not be a blocker but raising. @cgwalters?

Specifically,
- the ESP unraiding change (coreos/fedora-coreos-config#794)
- working around buggy udev (coreos/fedora-coreos-config#779)
- --copy-network regression (coreos/fedora-coreos-config#800)
- Azure udev rules in initramfs (coreos/fedora-coreos-config#786)

For the latter, also apply the same `|| exit 1` change from
coreos/fedora-coreos-config#800 to our own
dracut modules for good measure.

```
$ git shortlog --invert-grep --author='CoreOS Bot' 6c9f15c8857772f730cdb0b5b2df143e778c5d0d..8c07b7391473910ba3884ee0d3763743805ac78f
Benjamin Gilbert (6):
      40ignition-ostree: silence mkfs.xfs
      coreos-boot-mount-generator: stop mounting /boot/efi
      40ignition-ostree: rename mount_and_restore_filesystem
      40ignition-ostree: create mountpoint in mount_verbose
      40ignition-ostree: add get_partlabels_for_parttype helper
      40ignition-ostree: copy ESP contents as independent filesystems

Dusty Mabe (1):
      overrides: drop graduated overrides

Jonathan Lebon (7):
      40ignition-ostree/transposefs: also trigger udev on by-label link mismatch for ESP
      40ignition-ostree/transposefs: factor out function to restore fs
      40ignition-ostree/transposefs: relabel the root of reprovisioned filesystems
      40ignition-ostree/transposefs: load zram with num_devices=0
      Add rawhide repo file
      05core: re-order and rename some dracut modules
      05core: add `|| exit 1` to `systemctl add-{requires,wants}` calls

Kelvin Fan (1):
      overlay.d/15fcos: Stop utilizing c-l-h-m private dir

Luca BRUNO (1):
      overrides: drop stale Afterburn entries

Micah Abbott (2):
      use WALinuxAgent-udev package for Azure udev rules
      overlay: add new module for installing Azure udev rules

Prashanth Sundararaman (1):
      tests: Enable TPM test for all arches except s390x

Timothée Ravier (1):
      manifests/fedora-coreos-base: Mask systemd-repart
```
This overlay includes the Azure udev rules which were removed from
05core in coreos/fedora-coreos-config#786 in
favour of using `WALinuxAgent-udev` instead. Though that package isn't
yet in el8 (see https://bugzilla.redhat.com/show_bug.cgi?id=1913074).
@jlebon jlebon force-pushed the pr/bump-fcos-and-tweak-systemctl-add-requires-wants branch from 5e6027a to 5cd6441 Compare January 6, 2021 14:33
@jlebon
Copy link
Member Author

jlebon commented Jan 6, 2021

OK, rebumped this to include coreos/fedora-coreos-config#786. Correspondingly as per coreos/fedora-coreos-config#786 (comment), also added a new overlay.d/ dir to keep shipping the rules in RHCOS until we have a -udev subpackage. @miabbott Are you able to test this?

@miabbott
Copy link
Member

miabbott commented Jan 6, 2021

OK, rebumped this to include coreos/fedora-coreos-config#786. Correspondingly as per coreos/fedora-coreos-config#786 (comment), also added a new overlay.d/ dir to keep shipping the rules in RHCOS until we have a -udev subpackage. @miabbott Are you able to test this?

I'll try to get it tested in Azure proper today

@miabbott
Copy link
Member

miabbott commented Jan 6, 2021

@jlebon I believe we our own dracut module for the Azure udev rules here

$ git diff --staged
diff --git a/overlay.d/05rhcos/usr/lib/dracut/modules.d/25coreos-azure-udev/module-setup.sh b/overlay.d/05rhcos/usr/lib/dracut/modules.d/25coreos-azure-udev/module-setup.sh
new file mode 100644
index 0000000..e796e89
--- /dev/null
+++ b/overlay.d/05rhcos/usr/lib/dracut/modules.d/25coreos-azure-udev/module-setup.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+# We want to provide Azure udev rules as part of the initrd, so that Ignition
+# is able to detect disks and act on them.
+#
+# If the WALinuxAgent-udev package is changed to install the udev rules as
+# part of the initramfs, we should drop this module.
+#
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1909287
+# See also https://bugzilla.redhat.com/show_bug.cgi?id=1756173
+
+install() {
+    inst_multiple \
+        /usr/lib/udev/rules.d/66-azure-storage.rules \
+        /usr/lib/udev/rules.d/99-azure-product-uuid.rules
+}

@jlebon
Copy link
Member Author

jlebon commented Jan 6, 2021

@jlebon I believe we our own dracut module for the Azure udev rules here

Hmm, we should be inheriting that from FCOS though, right?

@miabbott
Copy link
Member

miabbott commented Jan 6, 2021

@jlebon I believe we our own dracut module for the Azure udev rules here

Hmm, we should be inheriting that from FCOS though, right?

You are probably right...let me clean up my repo and make sure I've got it all straight.

@miabbott
Copy link
Member

miabbott commented Jan 6, 2021

I think I must have forgot to git submodule update before building/testing. Looks like the rules are correctly installed in the initramfs; still need to test in Azure for reals.

@cgwalters
Copy link
Member

We realized a bit late that not mounting the ESP by default currently breaks bootupd. T

bootupd 0.2.5 that fixes this is built in 4.7.

@miabbott
Copy link
Member

miabbott commented Jan 6, 2021

@jlebon OK, built this cleanly and confirmed that the udev rules are operating properly on Azure. Thanks for your patience.

@miabbott
Copy link
Member

miabbott commented Jan 6, 2021

/approve

@jlebon
Copy link
Member Author

jlebon commented Jan 7, 2021

Looks like this is ready for a /lgtm now? :)

@miabbott
Copy link
Member

miabbott commented Jan 7, 2021

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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,miabbott]

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

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2021
@openshift-merge-robot openshift-merge-robot merged commit 522e221 into openshift:master Jan 7, 2021
@jlebon jlebon deleted the pr/bump-fcos-and-tweak-systemctl-add-requires-wants branch April 23, 2023 19:56
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.

6 participants