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.

Sign up for GitHub

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

manifests: Split container engines and deps into sub manifests #2877

Closed
wants to merge 1 commit into from
+58 −30
Closed

manifests: Split container engines and deps into sub manifests #2877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions manifests/fedora-coreos-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ postprocess:
- |
#!/usr/bin/env bash
set -xeuo pipefail
setsebool -P -N container_use_cephfs on # RHBZ#1692369
setsebool -P -N virt_use_samba on # RHBZ#1754825

# Mask dnsmasq. We include dnsmasq for host services that use the dnsmasq
Expand Down Expand Up @@ -103,23 +102,10 @@ packages:
- polkit
# Containers
- systemd-container catatonit
- fuse-overlayfs slirp4netns
# Some host applications(i.e. NetworkManager) use dnsmasq
# as the binary for some various utility operations.
# https://github.com/coreos/fedora-coreos-tracker/issues/519
- dnsmasq
# For podman v4 netavark gets pulled in but it only recommends
# aardvark-dns (which provides name resolution based on container
# names). This functionality was previously provided by dnsname from
# podman-plugins in the podman v3 stack.
# See https://github.com/containers/netavark/pull/217
- aardvark-dns
# Since we need `containernetworking-plugins` installed to continue
# to support CNI networks we need to also explicitly install
# `netavark` so we get both of them installed since both of them
# provide `container-network-stack`.
# https://github.com/coreos/fedora-coreos-tracker/issues/1128#issuecomment-1071458717
- netavark
# Minimal NFS client
- nfs-utils-coreos
# Active Directory support
Expand Down Expand Up @@ -179,12 +165,9 @@ packages:
# - Add this package on x86_64 and aarch64 (the two architectures
# GCP supports. https://github.com/coreos/fedora-coreos-tracker/issues/1494
# This should be moved to a shared manifest when RHEL has this package.
# - crun-wasm wasmedge-rt
# - Support for wasm runtime: https://github.com/coreos/fedora-coreos-tracker/issues/1375
packages-x86_64:
- irqbalance
- google-compute-engine-guest-configs-udev
- crun-wasm wasmedge-rt
# Include AMD microcode updates, see https://github.com/coreos/fedora-coreos-tracker/issues/1618.
# This normally should belong in bootable-rpm-ostree.yaml (alongside
# `microcode_ctl`), but this change hasn't hit RHCOS yet.
Expand All @@ -199,7 +182,6 @@ packages-aarch64:
- irqbalance
- qemu-user-static-x86
- google-compute-engine-guest-configs-udev
- crun-wasm wasmedge-rt
packages-s390x:
- qemu-user-static-x86

Expand Down
19 changes: 13 additions & 6 deletions manifests/fedora-coreos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ rojig:
add-commit-metadata:
fedora-coreos.stream: ${stream}

# Include all container engines by default
variables:
container_engines: true

include: fedora-coreos-base.yaml
conditional-include:
Expand All @@ -27,17 +30,25 @@ conditional-include:
# passwd RPM was obsoleted by shadow-utils in F40+, but we need to keep
# including it in F39. Remove this when we are on F40+ on all streams.
include: passwd.yaml
- if: releasever == 39
- if:
- releasever == 39
- container_engines == true
# No longer need CNI plugins in f40 since Podman dropped
# support for CNI networking entirely in Podmanv5
# Remove this once we have Podman v5 in f39.
# xref: https://github.com/coreos/fedora-coreos-tracker/issues/1629
include: cni-plugins.yaml
- if: releasever == 39
- if:
- releasever == 39
- container_engines == true
# Checks for breaking changes that came with Podman v5.
include: podman-v5.yaml
- if: releasever >= 40
include: cliwrap.yaml
- if: container_engines == true
include:
- podman.yaml
- moby-engine.yaml
travier marked this conversation as resolved.
Show resolved Hide resolved

ostree-layers:
- overlay/15fcos
Expand All @@ -55,10 +66,6 @@ packages:
# the archive repo for more reliable package layering
# https://github.com/coreos/fedora-coreos-tracker/issues/400
- fedora-repos-archive
# CL ships this.
- moby-engine
# Already pulled in by moby-engine, but let's be explicit. Typhoon uses it.
- containerd
# Updates
- zincati
# Include and set the default editor
Expand Down
8 changes: 8 additions & 0 deletions manifests/moby-engine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This manifest is Fedora CoreOS only (not included in SCOS or RHCOS)

packages:
# CL shipped this
- moby-engine
# Already pulled in by moby-engine, but let's be explicit. Typhoon uses it.
- containerd
- runc
34 changes: 34 additions & 0 deletions manifests/podman.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# This manifest is Fedora CoreOS only (not included in SCOS or RHCOS)

packages:
- podman
- crun
Copy link
Member

Choose a reason for hiding this comment

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

any openshift/os changes we need to make because we're breaking this out into a separate manifest?

Copy link
Member Author

Choose a reason for hiding this comment

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

Likely, will look at this next.

# Include toolbox here as it pulls podman
- toolbox
- fuse-overlayfs slirp4netns
# For podman v4 netavark gets pulled in but it only recommends
# aardvark-dns (which provides name resolution based on container
# names). This functionality was previously provided by dnsname from
# podman-plugins in the podman v3 stack.
# See https://github.com/containers/netavark/pull/217
- aardvark-dns
# Since we need `containernetworking-plugins` installed to continue
# to support CNI networks we need to also explicitly install
# `netavark` so we get both of them installed since both of them
# provide `container-network-stack`.
# https://github.com/coreos/fedora-coreos-tracker/issues/1128#issuecomment-1071458717
- netavark

# Support for wasm runtime: https://github.com/coreos/fedora-coreos-tracker/issues/1375
packages-x86_64:
- crun-wasm wasmedge-rt
packages-aarch64:
- crun-wasm wasmedge-rt

postprocess:
# Enable SELinux booleans used by OpenShift
# https://github.com/coreos/fedora-coreos-tracker/issues/284
- |
#!/usr/bin/env bash
set -xeuo pipefail
setsebool -P -N container_use_cephfs on # RHBZ#1692369
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, this seems more general than a podman thing. Let's keep that bit in fedora-coreos-base.yaml?

Copy link
Member Author

Choose a reason for hiding this comment

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

This requires the containers selinux policy module otherwise it fails.

9 changes: 3 additions & 6 deletions manifests/user-experience.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,10 @@ packages:
# Remote Access
- openssh-clients openssh-server
# Container tooling
## crun recommends but doesn't require criu and criu-libs. We want them for
## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
- crun criu criu-libs
- podman
- runc
- skopeo
- toolbox
# crun recommends but doesn't require criu and criu-libs. We want them for
# checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
- criu criu-libs
# passt provides user-mode networking daemons for namespaces
- passt
# nvme-cli for managing nvme disks
Expand Down
Loading