github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

PR comments

pull/9976/head
freddygv 2021-04-08 11:16:03 -06:00
parent ab752c1c86
commit b21224a4c8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/proxycfg/state.go
View File

@ -336,6 +336,7 @@ func (s *state) initWatchesConnectProxy(snap *ConfigSnapshot) error {
// Store defaults keyed under wildcard so they can be applied to centrally configured upstreams // Store defaults keyed under wildcard so they can be applied to centrally configured upstreams
if u.DestinationName == structs.WildcardSpecifier { if u.DestinationName == structs.WildcardSpecifier {
snap.ConnectProxy.UpstreamConfig[u.DestinationID().String()] = &u snap.ConnectProxy.UpstreamConfig[u.DestinationID().String()] = &u
continue
} }
// This can be true if the upstream is a synthetic entry populated from centralized upstream config. // This can be true if the upstream is a synthetic entry populated from centralized upstream config.

2
agent/structs/structs.go
View File

@ -1153,7 +1153,7 @@ func (s *NodeService) Validate() error {
"Proxy.DestinationServiceName must be non-empty for Connect proxy "+ "Proxy.DestinationServiceName must be non-empty for Connect proxy "+
"services")) "services"))
} }
if strings.TrimSpace(s.Proxy.DestinationServiceName) == WildcardSpecifier { if s.Proxy.DestinationServiceName == WildcardSpecifier {
result = multierror.Append(result, fmt.Errorf( result = multierror.Append(result, fmt.Errorf(
"Proxy.DestinationServiceName must not be a wildcard for Connect proxy "+ "Proxy.DestinationServiceName must not be a wildcard for Connect proxy "+
"services")) "services"))