From 7d6775b082fd099f0b7a66a3f5120af0eae26e74 Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Wed, 2 Nov 2022 12:57:04 -0700 Subject: [PATCH] wgengine: respect --no-logs-no-support flag for network logging (#6172) In the future this will cause a node to be unable to join the tailnet if network logging is enabled. Signed-off-by: Joe Tsai --- wgengine/userspace.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wgengine/userspace.go b/wgengine/userspace.go index ead8efee8..320fc9245 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -887,6 +887,9 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, routerCfg *router.Config, netLogIDsWasValid := !oldLogIDs.NodeID.IsZero() && !oldLogIDs.DomainID.IsZero() netLogIDsChanged := netLogIDsNowValid && netLogIDsWasValid && newLogIDs != oldLogIDs netLogRunning := netLogIDsNowValid && !routerCfg.Equal(&router.Config{}) + if envknob.NoLogsNoSupport() { + netLogRunning = false + } // TODO(bradfitz,danderson): maybe delete this isDNSIPOverTailscale // field and delete the resolver.ForwardLinkSelector hook and