coreos/fedora-coreos-config
1
0
Fork 0
mirror of https://github.com/coreos/fedora-coreos-config.git synced 2026-02-05 09:45:30 +01:00
Code Issues Releases Activity

manifests: cleanup f39 conditional includes

Browse Source 
We have fedora 40 on all streams now so remove the conditionnals on F39
This commit is contained in:
jbtrystram
2024-07-03 18:12:26 +02:00
committed by Jean-Baptiste Trystram
parent 9dd6925064
commit 3db9fbc473
8 changed files with 0 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/cni-plugins.yaml
View File

@@ -1,5 +0,0 @@
# Issue: https://github.com/coreos/fedora-coreos-config/pull/2818
# Delete this file once we are on Podman v5 everywhere.
# i.e. We have moved past F39.
packages:
- containernetworking-plugins podman-plugins

13
manifests/fedora-coreos.yaml
View File

@@ -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

6
manifests/passwd.yaml
View File

@@ -1,6 +0,0 @@
packages:
# passwd was obsoleted by shadow-utils in F40+
# https://src.fedoraproject.org/rpms/shadow-utils/c/91360f25a8c8b810d59bec2803a2477a2647c775?branch=rawhide
# We'll include this file on F39 for now. It can be removed when we are no
# longer on F39. RHCOS was taken care of by https://github.com/openshift/os/pull/1438
- passwd

5
manifests/podman-v5.yaml
View File

@@ -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

1
overlay.d/14podman-v5/usr/lib/systemd/system-preset/14-fcos.preset
View File

@@ -1 +0,0 @@
enable coreos-cni-networking-check.service

11
overlay.d/14podman-v5/usr/lib/systemd/system/coreos-cni-networking-check.service
View File

@@ -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

37
overlay.d/14podman-v5/usr/libexec/coreos-cni-networking-check
View File

@@ -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

8
overlay.d/README.md
View File

@@ -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
------