From 2d1955f5d4c379502eab433c819a0c8559d8f4dc Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Wed, 3 Apr 2024 16:10:07 +0200 Subject: [PATCH] Manifests: Create a kubernetes specific manifest Kubernetes 1.28 now supports swap on zram as beta, so we need to ship this package in RHCOS. Moving zram to a separate manifest that could be optionnaly enabled for k8s use ? See https://github.com/coreos/fedora-coreos-docs/issues/530 --- manifests/fedora-coreos-base.yaml | 4 +--- manifests/kubernetes.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 manifests/kubernetes.yaml diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml index 57fe09ac96..47ec281067 100644 --- a/manifests/fedora-coreos-base.yaml +++ b/manifests/fedora-coreos-base.yaml @@ -12,6 +12,7 @@ include: - shared-workarounds.yaml # See https://github.com/coreos/bootupd - bootupd.yaml + - kubernetes.yaml ostree-layers: - overlay/05core - overlay/08nouveau @@ -150,9 +151,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/kubernetes.yaml b/manifests/kubernetes.yaml new file mode 100644 index 0000000000..7db6aa4691 --- /dev/null +++ b/manifests/kubernetes.yaml @@ -0,0 +1,10 @@ +# This file is included in RHEL CoreOS, see +# https://github.com/openshift/os/blob/71c974b1e456292033e3ef3fe7bcfe17d1855ebc/manifest.yaml#L12 +# Only apply changes here that should apply to both FCOS and RHCOS. + +# The intent of this file is to gather packages and configuration that are tailored towards a kubernetes deployment + +packages: +# zram-generator (but not zram-generator-defaults) for F33 change +# https://github.com/coreos/fedora-coreos-tracker/issues/509 +- zram-generator \ No newline at end of file