Skip to content

Commit

Permalink
manifests: cleanup f39 conditional includes
Browse files Browse the repository at this point in the history
We have fedora 40 on all streams now so remove the conditionnals on F39
  • Loading branch information
jbtrystram committed Jul 4, 2024
1 parent 93dfb93 commit e5f7be5
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 86 deletions.
5 changes: 0 additions & 5 deletions manifests/cni-plugins.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions manifests/fedora-coreos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,6 @@ conditional-include:
- if: basearch != "s390x"
# And remove some cruft from grub2
include: grub2-removals.yaml
- if: releasever == 39
# 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
# 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
# Checks for breaking changes that came with Podman v5.
include: podman-v5.yaml
# On <41, we want to keep making sure dnf doesn't slip in somehow
# On 41+, we do want it
# https://github.com/coreos/fedora-coreos-tracker/issues/1687
Expand Down
6 changes: 0 additions & 6 deletions manifests/passwd.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions manifests/podman-v5.yaml

This file was deleted.

This file was deleted.

This file was deleted.

37 changes: 0 additions & 37 deletions overlay.d/14podman-v5/usr/libexec/coreos-cni-networking-check

This file was deleted.

8 changes: 0 additions & 8 deletions overlay.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,6 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1700056

Warning about `/etc/sysconfig`.

14podman-v5
------

Warn about breaking changes [1] with Podman v5 and link the
users to how they can adapt their existing nodes.

[1] https://github.com/coreos/fedora-coreos-tracker/issues/1629

15fcos
------

Expand Down

0 comments on commit e5f7be5

Please sign in to comment.