Skip to content

K
k3s
Commit 7de34a00 authored by Manuel Buil's avatar Manuel Buil
Browse files
Options

Fix bug in dual-stack

We forgot to remove the check to allow dual-stack and flannel Signed-off-by: 's avatarManuel Buil <mbuil@suse.com>
parent 334eae11
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/cli/server/server.go
View file @ 7de34a00
...@@ -488,8 +488,8 @@ func validateNetworkConfiguration(serverConfig server.Config) error { ...@@ -488,8 +488,8 @@ func validateNetworkConfiguration(serverConfig server.Config) error {
return errors.Wrap(err, "failed to validate cluster-dns") return errors.Wrap(err, "failed to validate cluster-dns")
} }
if (serverConfig.ControlConfig.FlannelBackend != "none" || serverConfig.ControlConfig.DisableNPC == false) && (dualCluster || dualService) { if (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") return errors.New("network policy enforcement is not compatible with dual-stack operation; server must be restarted with --disable-network-policy")
} }
if dualDNS == true { if dualDNS == true {
return errors.New("dual-stack cluster-dns is not supported") return errors.New("dual-stack cluster-dns is not supported")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment