From a9f8f2a1bf7e3d1e2fab5ebe858325a6d70b746c Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Wed, 3 Apr 2024 16:10:07 +0200 Subject: [PATCH] Manifests: move zram to system-configuration Kubernetes 1.28 now supports swap on zram as beta Moving the zram-generator package to a manifest shared with rhcos. See https://github.com/coreos/fedora-coreos-docs/issues/530 --- manifests/fedora-coreos-base.yaml | 3 --- manifests/system-configuration.yaml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index 57fe09ac96..93f45bfe85 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -150,9 +150,6 @@ packages: - console-login-helper-messages-motdgen # i18n - kbd - # zram-generator (but not zram-generator-defaults) for F33 change - # https://github.com/coreos/fedora-coreos-tracker/issues/509 - - zram-generator # resolved was broken out to its own package in rawhide/f35 - systemd-resolved # In F35+ need `iptables-legacy` package diff --git a/manifests/system-configuration.yaml b/manifests/system-configuration.yaml index dc86093815..0f982b612d 100644 --- a/manifests/system-configuration.yaml +++ b/manifests/system-configuration.yaml @@ -43,6 +43,9 @@ packages: - ssh-key-dir # Allow for configuring different timezones - tzdata + # zram-generator (but not zram-generator-defaults) for F33 change + # https://github.com/coreos/fedora-coreos-tracker/issues/509 + - zram-generator postprocess: # Mask systemd-repart. Ignition is responsible for partition setup on first