From 60b122a2eaeefc548dbb2cf8b638318d0bf3a105 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Wed, 3 Jul 2024 18:12:26 +0200 Subject: [PATCH] Cleanup F39 conditionnal includes. We have fedora 40 on all streams now so remove the conditionnals on F39 --- manifests/fedora-coreos.yaml | 13 ------- manifests/podman-v5.yaml | 5 --- .../lib/systemd/system-preset/14-fcos.preset | 1 - .../coreos-cni-networking-check.service | 11 ------ .../usr/libexec/coreos-cni-networking-check | 37 ------------------- overlay.d/README.md | 8 ---- 6 files changed, 75 deletions(-) delete mode 100644 manifests/podman-v5.yaml delete mode 100644 overlay.d/14podman-v5/usr/lib/systemd/system-preset/14-fcos.preset delete mode 100644 overlay.d/14podman-v5/usr/lib/systemd/system/coreos-cni-networking-check.service delete mode 100755 overlay.d/14podman-v5/usr/libexec/coreos-cni-networking-check diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml index a79fdc5598..581e0e38b9 100644 --- a/manifests/fedora-coreos.yaml +++ b/manifests/fedora-coreos.yaml @@ -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 diff --git a/manifests/podman-v5.yaml b/manifests/podman-v5.yaml deleted file mode 100644 index e38fae413e..0000000000 --- a/manifests/podman-v5.yaml +++ /dev/null @@ -1,5 +0,0 @@ -# https://github.com/coreos/fedora-coreos-tracker/issues/1629 -# Delete this file once we are on Podman v5 everywhere. -# i.e. We have moved past F39. -ostree-layers: - - overlay/14podman-v5 diff --git a/overlay.d/14podman-v5/usr/lib/systemd/system-preset/14-fcos.preset b/overlay.d/14podman-v5/usr/lib/systemd/system-preset/14-fcos.preset deleted file mode 100644 index 28f419bc04..0000000000 --- a/overlay.d/14podman-v5/usr/lib/systemd/system-preset/14-fcos.preset +++ /dev/null @@ -1 +0,0 @@ -enable coreos-cni-networking-check.service diff --git a/overlay.d/14podman-v5/usr/lib/systemd/system/coreos-cni-networking-check.service b/overlay.d/14podman-v5/usr/lib/systemd/system/coreos-cni-networking-check.service deleted file mode 100644 index 5b39d848a7..0000000000 --- a/overlay.d/14podman-v5/usr/lib/systemd/system/coreos-cni-networking-check.service +++ /dev/null @@ -1,11 +0,0 @@ -# This service checks if the system nodes are still using -# CNI networking. If so, they will be warned to move -# their nodes to netavark respectively. -[Unit] -Description=Check If Podman Is Still Using CNI Networking -[Service] -Type=oneshot -ExecStart=/usr/libexec/coreos-cni-networking-check -RemainAfterExit=yes -[Install] -WantedBy=multi-user.target diff --git a/overlay.d/14podman-v5/usr/libexec/coreos-cni-networking-check b/overlay.d/14podman-v5/usr/libexec/coreos-cni-networking-check deleted file mode 100755 index 8aab7f616d..0000000000 --- a/overlay.d/14podman-v5/usr/libexec/coreos-cni-networking-check +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/bash -set -euo pipefail -# Podman is dropping support for CNI networking. -# Podman 5 changes: https://fedoraproject.org/wiki/Changes/Podman5 -# This script checks if the system nodes are still using CNI -# networking. If so, they will warned to move their nodes to Netavark. - -# Change the output color to yellow -warn=$(echo -e '\033[0;33m') -# No color -nc=$(echo -e '\033[0m') - -# Podman supports two network backends Netavark and CNI. -# Netavark is the default network backend and was added in -# Podman version 4.0. CNI is deprecated and is removed -# in Podman version 5.0, in preference of Netavark. -podmanBackend=$(podman info --format "{{.Host.NetworkBackend}}") - -if [[ $podmanBackend != "netavark" ]]; then - motd_path=/run/motd.d/35_cni_warning.motd - - cat << EOF > "${motd_path}" -${warn} -############################################################################## -WARNING: Podman is using CNI networking. CNI is deprecated and will be -removed in the upcoming Podman v5.0, in preference of Netavark. To switch -from CNI networking to Netavark, you must run 'podman system reset --force'. -This will delete all of your images, containers, and custom networks. -Depending on your setup it may be preferable to reprovision the whole machine -from the latest images. - -To disable this warning, use: -sudo systemctl disable coreos-cni-networking-check.service -############################################################################## -${nc} -EOF -fi diff --git a/overlay.d/README.md b/overlay.d/README.md index 7fdf54070d..9597731fdf 100644 --- a/overlay.d/README.md +++ b/overlay.d/README.md @@ -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 ------