From 3254d0817364ac2c40d5d6bf015ea8c9b3c41d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveirinha?= Date: Thu, 28 Apr 2022 12:00:47 +0100 Subject: [PATCH] TUN-6014: Add remote config flag as default feature --- cmd/cloudflared/tunnel/configuration.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go index 14fd430c..778ec6b3 100644 --- a/cmd/cloudflared/tunnel/configuration.go +++ b/cmd/cloudflared/tunnel/configuration.go @@ -41,7 +41,8 @@ var ( LogFieldHostname = "hostname" - secretFlags = [2]*altsrc.StringFlag{credentialsContentsFlag, tunnelTokenFlag} + secretFlags = [2]*altsrc.StringFlag{credentialsContentsFlag, tunnelTokenFlag} + defaultFeatures = []string{supervisor.FeatureAllowRemoteConfig, supervisor.FeatureSerializedHeaders} ) // returns the first path that contains a cert.pem file. If none of the DefaultConfigSearchDirectories @@ -225,7 +226,7 @@ func prepareTunnelConfig( return nil, nil, errors.Wrap(err, "can't generate connector UUID") } log.Info().Msgf("Generated Connector ID: %s", clientUUID) - features := append(c.StringSlice("features"), supervisor.FeatureSerializedHeaders) + features := append(c.StringSlice("features"), defaultFeatures...) if c.IsSet(TunnelTokenFlag) { if transportProtocol == connection.AutoSelectFlag { protocolFetcher = func() (edgediscovery.ProtocolPercents, error) { @@ -243,7 +244,6 @@ func prepareTunnelConfig( return preferQuic, nil } } - features = append(features, supervisor.FeatureAllowRemoteConfig) log.Info().Msg("Will be fetching remotely managed configuration from Cloudflare API. Defaulting to protocol: quic") } namedTunnel.Client = tunnelpogs.ClientInfo{