mirror of
https://github.com/tailscale/tailscale.git
synced 2025-10-27 06:11:43 +01:00
feature/featuretags: make bird depend on advertiseroutes
Updates #cleanup Change-Id: I87082919064a5652c0d976cadd6d159787bb224a Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
parent
9123932710
commit
0f4dec928e
@ -113,7 +113,11 @@ var Features = map[FeatureTag]FeatureMeta{
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
"bakedroots": {Sym: "BakedRoots", Desc: "Embed CA (LetsEncrypt) x509 roots to use as fallback"},
|
"bakedroots": {Sym: "BakedRoots", Desc: "Embed CA (LetsEncrypt) x509 roots to use as fallback"},
|
||||||
"bird": {Sym: "Bird", Desc: "Bird BGP integration"},
|
"bird": {
|
||||||
|
Sym: "Bird",
|
||||||
|
Desc: "Bird BGP integration",
|
||||||
|
Deps: []FeatureTag{"advertiseroutes"},
|
||||||
|
},
|
||||||
"c2n": {
|
"c2n": {
|
||||||
Sym: "C2N",
|
Sym: "C2N",
|
||||||
Desc: "Control-to-node (C2N) support",
|
Desc: "Control-to-node (C2N) support",
|
||||||
|
|||||||
@ -962,7 +962,7 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, routerCfg *router.Config,
|
|||||||
nm.SelfNode.PrimaryRoutes(), nm.SelfNode.Hostinfo().RoutableIPs(),
|
nm.SelfNode.PrimaryRoutes(), nm.SelfNode.Hostinfo().RoutableIPs(),
|
||||||
isSubnetRouter, isSubnetRouter, e.lastIsSubnetRouter)
|
isSubnetRouter, isSubnetRouter, e.lastIsSubnetRouter)
|
||||||
}
|
}
|
||||||
isSubnetRouterChanged := isSubnetRouter != e.lastIsSubnetRouter
|
isSubnetRouterChanged := buildfeatures.HasAdvertiseRoutes && isSubnetRouter != e.lastIsSubnetRouter
|
||||||
|
|
||||||
engineChanged := checkchange.Update(&e.lastEngineFull, cfg)
|
engineChanged := checkchange.Update(&e.lastEngineFull, cfg)
|
||||||
routerChanged := checkchange.Update(&e.lastRouter, routerCfg)
|
routerChanged := checkchange.Update(&e.lastRouter, routerCfg)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user