Skip to content

Commit

Permalink
Merge pull request #284 from diazjf/fix-log
Browse files Browse the repository at this point in the history
Correct Logs for Mergeable Types with Duplicate Location
  • Loading branch information
pleshakov authored May 18, 2018
2 parents df381e1 + d9c86ee commit 6e3a897
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nginx-controller/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,7 @@ func (lbc *LoadBalancerController) getMinionsForMaster(master *nginx.IngressEx)
if val, ok := minionPaths[path.Path]; ok {
glog.Errorf("Ingress Resource %v/%v with the 'nginx.org/mergeable-ingress-type' annotation set to 'minion' cannot contain the same path as another ingress resource, %v/%v.",
ings.Items[i].Namespace, ings.Items[i].Name, val.Namespace, val.Name)
glog.Errorf("Path %s for Ingress Resource %v/%v will be ignored", path.Path, val.Namespace, val.Name)
glog.Errorf("Path %s for Ingress Resource %v/%v will be ignored", path.Path, ings.Items[i].Namespace, ings.Items[i].Name)
} else {
minionPaths[path.Path] = &ings.Items[i]
uniquePaths = append(uniquePaths, path)
Expand Down

0 comments on commit 6e3a897

Please sign in to comment.