Skip to content

Commit

Permalink
remove multiClusterCidr flag
Browse files Browse the repository at this point in the history
The MultiClusterCidr has been removed upstream (starting from 1.28) so the flag doesnt make sense anymore.

The mechanism is kept because the feature should be implemented similarly in a dedicated controller at some point.
  • Loading branch information
thomasferrandiz committed Oct 27, 2023
1 parent 44f5584 commit da22ed1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 140 deletions.
137 changes: 0 additions & 137 deletions Documentation/MultiClusterCIDR/README.md

This file was deleted.

4 changes: 1 addition & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ type CmdLineOpts struct {
iptablesForwardRules bool
netConfPath string
setNodeNetworkUnavailable bool
useMultiClusterCidr bool
}

var (
Expand Down Expand Up @@ -131,7 +130,6 @@ func init() {
flannelFlags.BoolVar(&opts.iptablesForwardRules, "iptables-forward-rules", true, "add default accept rules to FORWARD chain in iptables")
flannelFlags.StringVar(&opts.netConfPath, "net-config-path", "/etc/kube-flannel/net-conf.json", "path to the network configuration file")
flannelFlags.BoolVar(&opts.setNodeNetworkUnavailable, "set-node-network-unavailable", true, "set NodeNetworkUnavailable after ready")
flannelFlags.BoolVar(&opts.useMultiClusterCidr, "use-multi-cluster-cidr", false, "use MultiClusterCIDR API (alpha)")

log.InitFlags(nil)

Expand Down Expand Up @@ -177,7 +175,7 @@ func newSubnetManager(ctx context.Context) (subnet.Manager, error) {
opts.kubeAnnotationPrefix,
opts.netConfPath,
opts.setNodeNetworkUnavailable,
opts.useMultiClusterCidr)
false)
}

cfg := &etcd.EtcdConfig{
Expand Down

0 comments on commit da22ed1

Please sign in to comment.