Skip to content

[release-4.19] Backport disruptive changes #5266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: release-4.19
Choose a base branch
from
Draft

[release-4.19] Backport disruptive changes #5266

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df54ce
Add improved check for already applied configs in nmstate-configurati…
emy Jun 18, 2025
ea6e8db
Removed override protection of /etc/nmstate/cluster.yml in nmstate-co…
emy Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions templates/common/_base/files/nmstate-configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ contents:
rm -rf /etc/cno/mtu-migration
fi

if [ -e /etc/nmstate/openshift/applied ]; then
echo "Configuration already applied, exiting"
exit 0
fi

src_path="/etc/nmstate/openshift"
dst_path="/etc/nmstate"
hostname=$(hostname -s)
Expand All @@ -30,10 +25,14 @@ contents:
echo "No configuration found at $src_path/$host_file or $src_path/$cluster_file"
exit 0
fi

if [ -e "$dst_path/$config_file" ]; then
echo "ERROR: File $dst_path/$config_file exists. Refusing to overwrite."
exit 1

if [ -e "$src_path/applied" ]; then
sha_applied=$(sha256sum "$src_path/applied" | awk '{print $1}')
sha_config=$(sha256sum "$src_path/$config_file" | awk '{print $1}')
if ["$sha_applied"=="$sha_config"]; then
echo "Configuration already applied, exiting"
exit 0
fi
fi

# Handle the case where we're migrating from configure-ovs
Expand All @@ -43,4 +42,4 @@ contents:
ovs-vsctl --timeout=30 --if-exists del-br br0

cp "$src_path/$config_file" /etc/nmstate
touch /etc/nmstate/openshift/applied
cp "$src_path/$config_file" "$src_path/applied"