Merge pull request #282 from rollandf/clean-switch-dev-scripts

Remove switchdev scripts when uneeded
k8snetworkplumbingwg · Apr 26, 2022 · 0030dda · 0030dda
2 parents 70b25f6 + 8a47768
commit 0030dda
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/bindata/scripts/clean-k8s-services.sh b/bindata/scripts/clean-k8s-services.sh
@@ -9,10 +9,16 @@ chroot_path="/host"
 
 function clean_services() {
   # Remove switchdev service files
-  rm -f $chroot_path/etc/systemd/system/switchdev-configuration.service
-  rm -f $chroot_path/usr/local/bin/configure-switchdev.sh
+  rm -f $chroot_path/etc/systemd/system/switchdev-configuration-after-nm.service
+  rm -f $chroot_path/etc/systemd/system/switchdev-configuration-before-nm.service
+  rm -f $chroot_path/usr/local/bin/switchdev-configuration-after-nm.sh
+  rm -f $chroot_path/usr/local/bin/switchdev-configuration-before-nm.sh
   rm -f $chroot_path/etc/switchdev.conf
   rm -f $chroot_path/etc/udev/switchdev-vf-link-name.sh
+  # The following files are no longer created by config daemon
+  # Remove them in case of leftovers from earlier SR-IOV network operator
+  rm -f $chroot_path/usr/local/bin/configure-switchdev.sh
+  rm -f $chroot_path/etc/systemd/system/switchdev-configuration.service
 
   # clean NetworkManager and ovs-vswitchd services
   network_manager_service=$chroot_path/usr/lib/systemd/system/NetworkManager.service