[Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container (#26529)

blakerouse · web-flow · commit a8cb588d1b89 · 2021-06-28T13:22:26.000-04:00
* Fix issue with FLEET_CA not being used with fleet server is enabled in container.

* Add changelog.
diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc
@@ -44,6 +44,7 @@
 - Fix windows installer during enroll {pull}24343[24343]
 - Logging to file disabled on enroll {issue}24173[24173]
 - Prevent uninstall failures on empty config {pull}24838[24838]
+- Fix issue with FLEET_CA not being used with Fleet Server in container {pull}26529[26529]
 
 ==== New features
 
diff --git a/x-pack/elastic-agent/pkg/agent/cmd/container.go b/x-pack/elastic-agent/pkg/agent/cmd/container.go
@@ -385,9 +385,9 @@ func buildEnrollArgs(cfg setupConfig, token string, policyID string) ([]string,
 		if cfg.Fleet.Insecure {
 			args = append(args, "--insecure")
 		}
-		if cfg.Fleet.CA != "" {
-			args = append(args, "--certificate-authorities", cfg.Fleet.CA)
-		}
+	}
+	if cfg.Fleet.CA != "" {
+		args = append(args, "--certificate-authorities", cfg.Fleet.CA)
 	}
 	if token != "" {
 		args = append(args, "--enrollment-token", token)

Original file line number	Diff line number	Diff line change
`@@ -385,9 +385,9 @@ func buildEnrollArgs(cfg setupConfig, token string, policyID string) ([]string,`
`385`	`385`	`if cfg.Fleet.Insecure {`
`386`	`386`	`args = append(args, "--insecure")`
`387`	`387`	`}`
`388`		`- if cfg.Fleet.CA != "" {`
`389`		`- args = append(args, "--certificate-authorities", cfg.Fleet.CA)`
`390`		`- }`
	`388`	`+ }`
	`389`	`+ if cfg.Fleet.CA != "" {`
	`390`	`+ args = append(args, "--certificate-authorities", cfg.Fleet.CA)`
`391`	`391`	`}`
`392`	`392`	`if token != "" {`
`393`	`393`	`args = append(args, "--enrollment-token", token)`