Upgrade changes for OVN IC

When a submariner installation upgrades from legacy non-OVN-IC version to an OVN-IC version, cleanup resources created by legacy installation. Fixes submariner-io/enhancements#193 Signed-off-by: Vishal Thapar <[email protected]>
submariner-io · Aug 30, 2023 · a2fe53d · a2fe53d
1 parent 740b0b4
commit a2fe53d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/routeagent_driver/handlers/ovn/handler.go b/pkg/routeagent_driver/handlers/ovn/handler.go
@@ -88,6 +88,8 @@ func (ovn *Handler) GetNetworkPlugins() []string {
 }
 
 func (ovn *Handler) Init() error {
+	ovn.LegacyCleanup()
+
 	err := ovn.initIPtablesChains()
 	if err != nil {
 		return err

diff --git a/pkg/routeagent_driver/handlers/ovn/vsctl/vsctl.go b/pkg/routeagent_driver/handlers/ovn/vsctl/vsctl.go
@@ -65,7 +65,7 @@ func AddBridge(bridgeName string) error {
 }
 
 func DelBridge(bridgeName string) error {
-	_, err := vsctlCmd("del-br", bridgeName)
+	_, err := vsctlCmd("--if-exists", "del-br", bridgeName)
 
 	return err
 }