Skip to content

Commit

Permalink
consul: fix var name from rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
nickethier committed Jan 27, 2020
1 parent 018f071 commit 330d24c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion command/agent/consul/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,9 @@ func (c *ServiceClient) serviceRegs(ops *operations, service *structs.Service, w
return nil, fmt.Errorf("invalid Consul Connect configuration for service %q: %v", service.Name, err)
}

// Determine whether to use meta or canary_meta
var meta map[string]string
if task.Canary && len(service.CanaryMeta) > 0 {
if workload.Canary && len(service.CanaryMeta) > 0 {
meta = make(map[string]string, len(service.CanaryMeta)+1)
for k, v := range service.CanaryMeta {
meta[k] = v
Expand Down

0 comments on commit 330d24c

Please sign in to comment.