Skip to content

Commit

Permalink
Check if user has a correct cluster-cidr and service-cidr config
Browse files Browse the repository at this point in the history
Signed-off-by: Manuel Buil <mbuil@suse.com>
  • Loading branch information
manuelbuil committed Apr 25, 2022
1 parent f2ceeb0 commit 01e04df
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pkg/agent/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,14 @@ func run(ctx context.Context, cfg cmds.Agent, proxy proxy.Proxy) error {
}
serviceIPv6 := utilsnet.IsIPv6CIDR(nodeConfig.AgentConfig.ServiceCIDR)
clusterIPv6 := utilsnet.IsIPv6CIDR(nodeConfig.AgentConfig.ClusterCIDR)

enableIPv6 := dualCluster || dualService || dualNode || serviceIPv6 || clusterIPv6
nodeIPv6 := utilsnet.IsIPv6String(nodeConfig.AgentConfig.NodeIP)
if (serviceIPv6 != clusterIPv6) || (dualCluster != dualService) {
return errors.New("cluster-cidr and service-cidr must share the same IP version (IPv4, IPv6 or dual-stack)")
}
if (clusterIPv6 != nodeIPv6) || (dualCluster != dualNode) {
return errors.New("cluster-cidr and node-ip must share the same IP version (IPv4, IPv6 or dual-stack)")
}
enableIPv6 := dualCluster || clusterIPv6
conntrackConfig, err := getConntrackConfig(nodeConfig)
if err != nil {
return errors.Wrap(err, "failed to validate kube-proxy conntrack configuration")
Expand Down

0 comments on commit 01e04df

Please sign in to comment.