Skip to content

oem: port GCE to sysext image#1441

Merged
tormath1 merged 3 commits intomainfrom
tormath1/gcp-oem
Dec 4, 2023
Merged

oem: port GCE to sysext image#1441
tormath1 merged 3 commits intomainfrom
tormath1/gcp-oem

Conversation

@tormath1
Copy link
Copy Markdown
Contributor

@tormath1 tormath1 commented Nov 29, 2023

In this PR, we migrate the last important OEM partition to sysext image. The main change is the removal of the GCE ACI image started via systemd-nspawn.

Closes: flatcar/Flatcar#1146

TODO:

  • reword second commit (gce -> coreos-base/oem-gce)
  • consider removing ACI stuffs from the SDK ? it seems that only GCE was using it.

@@ -0,0 +1 @@
- GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
- GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146))
- GCP OEM images now use a systemd-sysext image for layering additional platform-specific software on top of `/usr` and being part of the OEM A/B updates ([flatcar#1146](https://github.com/flatcar/Flatcar/issues/1146))

Copy link
Copy Markdown
Member

@pothos pothos left a comment

Choose a reason for hiding this comment

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

One more task is to boot a GCE image, look at created files, and add them to the migration cleanup step in sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/oems/azure (some can be inferred from the base Ign but there is also /oem/flatcar-oem-gce.aci with the copy to /var/lib/flatcar-oem-gce.img and so on).

Edit: Done together, thanks!

/etc/systemd/system/oem-gce.service
/etc/systemd/system/multi-user.target.wants/oem-gce.service
/etc/systemd/system/oem-gce-enable-oslogin.service
/etc/systemd/system/sysinit.target.wants/oem-gce-enable-oslogin.service
/etc/systemd/system/oem-cloudinit.service
/etc/systemd/system/multi-user.target.wants/oem-cloudinit.service
/var/lib/flatcar-oem-gce
/var/lib/flatcar-oem-gce.img
/oem/flatcar-oem-gce.aci
/oem/bin/
/oem/units/
/oem/base/
/oem/files/

# no source directory
S="${WORKDIR}"

RDEPEND="coreos-base/coreos-oem-gce"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think we can remove this package and move the deps here, or? I think only app-emulation/google-compute-engine is needed, the rest looks related to the ACI setup.

@tormath1 tormath1 mentioned this pull request Dec 1, 2023
3 tasks
@tormath1 tormath1 marked this pull request as ready for review December 2, 2023 08:55
@tormath1 tormath1 requested a review from a team December 2, 2023 08:56
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Port GCE OEM setup to systemd-sysext image

2 participants