Revert "Fix issue where --insecure didn't propogate to Fleet Server E…

…S connection (elastic#27969)" (elastic#27997) (elastic#28003) This reverts commit 576be96. (cherry picked from commit b5ffc57) Co-authored-by: Michal Pristas <[email protected]>
leweafan · Sep 21, 2021 · 16b7131 · 16b7131
1 parent cb4ecaa
commit 16b7131
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc
@@ -82,7 +82,6 @@
 - Add validation for certificate flags to ensure they are absolute paths. {pull}27779[27779]
 - Migrate state on upgrade {pull}27825[27825]
 - Snapshot artifact lookup will use agent.download proxy settings. {issue}27903[27903] {pull}27904[27904]
-- Fix issue where --insecure didn't propogate to Fleet Server ES connection. {pull}27969[27969]
 
 ==== New features
 

diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
@@ -263,7 +263,6 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) (string, error) {
 		c.options.FleetServer.ConnStr, c.options.FleetServer.ServiceToken,
 		c.options.FleetServer.PolicyID,
 		c.options.FleetServer.Host, c.options.FleetServer.Port,
-		c.options.Insecure,
 		c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA,
 		c.options.FleetServer.Headers,
 		c.options.FleetServer.ProxyURL,
@@ -461,7 +460,6 @@ func (c *enrollCmd) enroll(ctx context.Context, persistentConfig map[string]inte
 			c.options.FleetServer.ConnStr, c.options.FleetServer.ServiceToken,
 			c.options.FleetServer.PolicyID,
 			c.options.FleetServer.Host, c.options.FleetServer.Port,
-			c.options.Insecure,
 			c.options.FleetServer.Cert, c.options.FleetServer.CertKey, c.options.FleetServer.ElasticsearchCA,
 			c.options.FleetServer.Headers,
 			c.options.FleetServer.ProxyURL, c.options.FleetServer.ProxyDisabled, c.options.FleetServer.ProxyHeaders)
@@ -761,7 +759,7 @@ func storeAgentInfo(s saver, reader io.Reader) error {
 
 func createFleetServerBootstrapConfig(
 	connStr, serviceToken, policyID, host string,
-	port uint16, insecure bool,
+	port uint16,
 	cert, key, esCA string,
 	headers map[string]string,
 	proxyURL string,
@@ -819,12 +817,6 @@ func createFleetServerBootstrapConfig(
 			},
 		}
 	}
-	if insecure {
-		if cfg.Server.TLS == nil {
-			cfg.Server.TLS = &tlscommon.Config{}
-		}
-		cfg.Server.TLS.VerificationMode = tlscommon.VerifyNone
-	}
 
 	if localFleetServer {
 		cfg.Client.Transport.Proxy.Disable = true