Skip to content

Commit

Permalink
Manifests: Create a kubernetes specific manifest
Browse files Browse the repository at this point in the history
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 coreos/fedora-coreos-docs#530
  • Loading branch information
jbtrystram committed Apr 3, 2024
1 parent 2ceb9e2 commit 2d1955f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
4 changes: 1 addition & 3 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ include:
- shared-workarounds.yaml
# See https://github.com/coreos/bootupd
- bootupd.yaml
- kubernetes.yaml
ostree-layers:
- overlay/05core
- overlay/08nouveau
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions manifests/kubernetes.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 2d1955f

Please sign in to comment.