Skip to content

Commit

Permalink
manifests: Inherit from Project sagano
Browse files Browse the repository at this point in the history
Fedora CoreOS predates the time of bootable containers.  As such,
it's actually pretty large (relatively speaking).  Project Sagano
is a fresh take on more minimal base images.

At the same time, we want to de-duplicate efforts.  With this,
CoreOS cherry picks a few manifests from the Sagano "tier-0" and
"tier-1".

There's *definitely* more we can share between the two, but
this is a notable starting point.
  • Loading branch information
cgwalters committed Oct 27, 2023
1 parent 5892c56 commit 06d27db
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 63 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "sagano"]
path = sagano
url = https://gitlab.com/CentOS/cloud/sagano
37 changes: 0 additions & 37 deletions manifests/bootable-rpm-ostree.yaml

This file was deleted.

1 change: 1 addition & 0 deletions manifests/bootable-rpm-ostree.yaml
13 changes: 0 additions & 13 deletions manifests/bootupd.yaml

This file was deleted.

1 change: 1 addition & 0 deletions manifests/bootupd.yaml
4 changes: 2 additions & 2 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# core functionality.

include:
- kernel.yaml
- firmware.yaml
- system-configuration.yaml
- ignition-and-ostree.yaml
- file-transfer.yaml
Expand Down Expand Up @@ -96,8 +98,6 @@ postprocess:
# available in RHCOS or not desired in RHCOS). All other packages should go
# into one of the sub-manifests listed at the top.
packages:
# We use the default kernel package, but note c9s may differ
- kernel
# Security
- polkit
# Containers
Expand Down
3 changes: 0 additions & 3 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ conditional-include:
- if: basearch == "aarch64"
# Fixup for kdump on aarch64 AWS instances
include: kdump-aarch64-aws-workaround.yaml
- if: basearch != "s390x"
# And remove some cruft from grub2
include: grub2-removals.yaml
- if: basearch == "ppc64le"
# Need OSTree autopruning on ppc64le (because kernels aren't compressed)
# until we increase the size of /boot.
Expand Down
1 change: 1 addition & 0 deletions manifests/firmware.yaml
8 changes: 0 additions & 8 deletions manifests/grub2-removals.yaml

This file was deleted.

1 change: 1 addition & 0 deletions manifests/grub2-removals.yaml
1 change: 1 addition & 0 deletions sagano
Submodule sagano added at 901c1f

0 comments on commit 06d27db

Please sign in to comment.