From d9c86ee147820067087c8a7052a6bddcd346747a Mon Sep 17 00:00:00 2001 From: Fernando Diaz Date: Thu, 17 May 2018 11:33:04 -0500 Subject: [PATCH] Correct Logs for Mergeable Types with Duplicate Location The logs displayed, showed the wrong ingress resource as the ignored ingress resource when a duplicate location was setup --- nginx-controller/controller/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx-controller/controller/controller.go b/nginx-controller/controller/controller.go index 8724f64440..96e9d6fe32 100644 --- a/nginx-controller/controller/controller.go +++ b/nginx-controller/controller/controller.go @@ -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)