Merge pull request #6036 from heyitsanthony/fix-embed-defaults
embed: add listen urls to default configrelease-3.1
commit
6079be7dae
|
@ -128,7 +128,9 @@ type securityConfig struct {
|
||||||
|
|
||||||
// NewConfig creates a new Config populated with default values.
|
// NewConfig creates a new Config populated with default values.
|
||||||
func NewConfig() *Config {
|
func NewConfig() *Config {
|
||||||
|
lpurl, _ := url.Parse(DefaultListenPeerURLs)
|
||||||
apurl, _ := url.Parse(DefaultInitialAdvertisePeerURLs)
|
apurl, _ := url.Parse(DefaultInitialAdvertisePeerURLs)
|
||||||
|
lcurl, _ := url.Parse(DefaultListenClientURLs)
|
||||||
acurl, _ := url.Parse(DefaultAdvertiseClientURLs)
|
acurl, _ := url.Parse(DefaultAdvertiseClientURLs)
|
||||||
cfg := &Config{
|
cfg := &Config{
|
||||||
CorsInfo: &cors.CORSInfo{},
|
CorsInfo: &cors.CORSInfo{},
|
||||||
|
@ -138,6 +140,8 @@ func NewConfig() *Config {
|
||||||
SnapCount: etcdserver.DefaultSnapCount,
|
SnapCount: etcdserver.DefaultSnapCount,
|
||||||
TickMs: 100,
|
TickMs: 100,
|
||||||
ElectionMs: 1000,
|
ElectionMs: 1000,
|
||||||
|
LPUrls: []url.URL{*lpurl},
|
||||||
|
LCUrls: []url.URL{*lcurl},
|
||||||
APUrls: []url.URL{*apurl},
|
APUrls: []url.URL{*apurl},
|
||||||
ACUrls: []url.URL{*acurl},
|
ACUrls: []url.URL{*acurl},
|
||||||
ClusterState: ClusterStateFlagNew,
|
ClusterState: ClusterStateFlagNew,
|
||||||
|
|
Loading…
Reference in New Issue