Merge pull request #4503 from manuelbuil/fix_dualStack_bug

[Release 1.21] Fix bug in dual-stack
k3s-io · Nov 16, 2021 · 6854470 · 6854470
2 parents 93cf545 + 7de34a0
commit 6854470
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
@@ -488,8 +488,8 @@ func validateNetworkConfiguration(serverConfig server.Config) error {
 		return errors.Wrap(err, "failed to validate cluster-dns")
 	}
 
-	if (serverConfig.ControlConfig.FlannelBackend != "none" || serverConfig.ControlConfig.DisableNPC == false) && (dualCluster || dualService) {
-		return errors.New("flannel CNI and network policy enforcement are not compatible with dual-stack operation; server must be restarted with --flannel-backend=none --disable-network-policy and an alternative CNI plugin deployed")
+	if (serverConfig.ControlConfig.DisableNPC == false) && (dualCluster || dualService) {
+		return errors.New("network policy enforcement is not compatible with dual-stack operation; server must be restarted with --disable-network-policy")
 	}
 	if dualDNS == true {
 		return errors.New("dual-stack cluster-dns is not supported")