Skip to content

Commit

Permalink
Revert "Fix issue where --insecure didn't propogate to Fleet Server E…
Browse files Browse the repository at this point in the history
…S connection (#27969)" (#27997)

This reverts commit cbbe8c2.

(cherry picked from commit 88b29b5)
  • Loading branch information
michalpristas authored and mergify-bot committed Sep 20, 2021
1 parent e49ec97 commit 8269f73
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion x-pack/elastic-agent/CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 1 addition & 9 deletions x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8269f73

Please sign in to comment.