Skip to content

Commit

Permalink
watch: don't set TLSConfig.Address explicitly (#4727)
Browse files Browse the repository at this point in the history
Don't set the value of TLSConfig.Address explicitly.

This will make sure env vars like CONSUL_TLS_SERVER_NAME are taken into account for the connection. Fixes #4718.
  • Loading branch information
igal-s authored and hanshasselberg committed Oct 8, 2018
1 parent 8ba1c54 commit e1fe3af
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion agent/config/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,6 @@ func (c *RuntimeConfig) APIConfig(includeClientCerts bool) (*api.Config, error)
cfg.Scheme = "https"
cfg.TLSConfig.CAFile = c.CAFile
cfg.TLSConfig.CAPath = c.CAPath
cfg.TLSConfig.Address = httpsAddr
if includeClientCerts {
cfg.TLSConfig.CertFile = c.CertFile
cfg.TLSConfig.KeyFile = c.KeyFile
Expand Down

0 comments on commit e1fe3af

Please sign in to comment.