Skip to content

Commit

Permalink
Fix bug in dual-stack
Browse files Browse the repository at this point in the history
We forgot to remove the check to allow dual-stack and flannel

Signed-off-by: Manuel Buil <mbuil@suse.com>
  • Loading branch information
manuelbuil committed Nov 16, 2021
1 parent 334eae1 commit ac0f46b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions pkg/cli/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,10 @@ 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")
}
Expand Down

0 comments on commit ac0f46b

Please sign in to comment.