Revert "Add ability to pass configuration options to flannel backend"

This reverts commit 86435769. Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>

Revert "Add ability to pass configuration options to flannel backend"
52323cba · Roberto Bonafiglia · Roberto Bonafiglia · b86a6947 · 52323cba
Commit 52323cba authored Feb 13, 2025 by Roberto Bonafiglia Committed by Roberto Bonafiglia Mar 05, 2025
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 13 deletions

setup.go pkg/agent/flannel/setup.go +2 -13

No files found.
--- a/pkg/agent/flannel/setup.go
+++ b/pkg/agent/flannel/setup.go
@@ -48,8 +48,7 @@ const (
 	wireguardNativeBackend = `{
 	"Type": "wireguard",
-	"PersistentKeepaliveInterval": %PersistentKeepaliveInterval%,
+	"PersistentKeepaliveInterval": 25
-	"Mode": "%Mode%"
 }`
 	emptyIPv6Network = "::/0"
@@ -210,7 +209,6 @@ func createFlannelConf(nodeConfig *config.Node) error {
 	}
 	var backendConf string
-	backendOptions := make(map[string]string)
 	// precheck and error out unsupported flannel backends.
 	switch nodeConfig.FlannelBackend {
@@ -241,16 +239,7 @@ func createFlannelConf(nodeConfig *config.Node) error {
 		}
 		backendConf = strings.ReplaceAll(tailscaledBackend, "%Routes%", routes)
 	case config.FlannelBackendWireguardNative:
-		mode, ok := backendOptions["Mode"]
+		backendConf = wireguardNativeBackend
-		if !ok {
-			mode = "separate"
-		}
-		keepalive, ok := backendOptions["PersistentKeepaliveInterval"]
-		if !ok {
-			keepalive = "25"
-		}
-		backendConf = strings.ReplaceAll(wireguardNativeBackend, "%Mode%", mode)
-		backendConf = strings.ReplaceAll(backendConf, "%PersistentKeepaliveInterval%", keepalive)
 	default:
 		return fmt.Errorf("Cannot configure unknown flannel backend '%s'", nodeConfig.FlannelBackend)
 	}