From 88b29b5a500c9e02b620cc01bb0d6455754dc705 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Mon, 20 Sep 2021 14:11:55 +0200 Subject: [PATCH] Revert "Fix issue where --insecure didn't propogate to Fleet Server ES connection (#27969)" (#27997) This reverts commit cbbe8c2a8674630f5bd9ba441c128826bc8269c5. --- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 - x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index b3ca84d195f..9bcda5fe195 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -87,7 +87,6 @@ - Add "_monitoring" suffix to monitoring instance names to remove ambiguity with the status command. {issue}25449[25449] - Ignore ErrNotExists when fixing permissions. {issue}27836[27836] {pull}27846[27846] - 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 index c57f77bbb11..8d18bf6ef9a 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go @@ -299,7 +299,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.ProxyURL, @@ -496,7 +495,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.ProxyURL, c.options.ProxyDisabled, c.options.ProxyHeaders) @@ -802,7 +800,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, @@ -860,12 +858,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