Merge pull request #4267 from twz123/os-specific-cleanup

Consolidate network bridge cleanup

Author: twz123

pkg/cleanup/bridge_darwin.go

@@ -18,24 +18,23 @@ package cleanup
 
 import (
 	"fmt"
-	"runtime"
 
 	"github.com/vishvananda/netlink"
 )
 
-type bridge struct{}
+func newBridgeStep() Step {
+	return linuxBridge{}
+}
+
+type linuxBridge struct{}
 
 // Name returns the name of the step
-func (b *bridge) Name() string {
+func (linuxBridge) Name() string {
 	return "kube-bridge leftovers cleanup step"
 }
 
 // Run removes found kube-bridge leftovers
-func (b *bridge) Run() error {
-	if runtime.GOOS == "windows" {
-		return nil
-	}
-
+func (linuxBridge) Run() error {
 	lnks, err := netlink.LinkList()
 	if err != nil {
 		return fmt.Errorf("failed to get link list from netlink: %w", err)

pkg/cleanup/bridge_linux.go

@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
 Copyright 2021 k0s authors
 
@@ -16,6 +18,6 @@ limitations under the License.
 
 package cleanup
 
-// no need to build unix specific funcs into windows
-func cleanupMount(path string)            {}
-func cleanupNetworkNamespace(path string) {}
+func newBridgeStep() Step {
+	return nil
+}

pkg/cleanup/cleanup_windows.go renamed to pkg/cleanup/bridge_other.go

@@ -77,7 +77,10 @@ func (c *Config) Cleanup() error {
 		&services{Config: c},
 		&directories{Config: c},
 		&cni{},
-		&bridge{},
+	}
+
+	if bridge := newBridgeStep(); bridge != nil {
+		cleanupSteps = append(cleanupSteps, bridge)
 	}
 
 	for _, step := range cleanupSteps {