Skip to content

Commit 6e3a897

Browse files
authored
Merge pull request #284 from diazjf/fix-log
Correct Logs for Mergeable Types with Duplicate Location
2 parents df381e1 + d9c86ee commit 6e3a897

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

nginx-controller/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ func (lbc *LoadBalancerController) getMinionsForMaster(master *nginx.IngressEx)
12591259
if val, ok := minionPaths[path.Path]; ok {
12601260
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.",
12611261
ings.Items[i].Namespace, ings.Items[i].Name, val.Namespace, val.Name)
1262-
glog.Errorf("Path %s for Ingress Resource %v/%v will be ignored", path.Path, val.Namespace, val.Name)
1262+
glog.Errorf("Path %s for Ingress Resource %v/%v will be ignored", path.Path, ings.Items[i].Namespace, ings.Items[i].Name)
12631263
} else {
12641264
minionPaths[path.Path] = &ings.Items[i]
12651265
uniquePaths = append(uniquePaths, path)

0 commit comments

Comments
 (0)