Merge pull request #34158 from quinton-hoole/2016-10-05-fix-ingress-bug-mac

Automatic merge from submit-queue Add missing argument to log message in federated ingress controller. Minor fix, to address this: 1006 01:08:50.605184 1 ingress_controller.go:674] No annotation "kubernetes.io/ingress.global-static-ip-name" exists on ingress "e2e-tests-federated-ingress-2787b/federated-ingress" in federation, and index of cluster "federation-e2e-gce-us-central1-f" is 1 and not zero. Not queueing create operation for ingress *%!q(MISSING)* until annotation exists

Merge pull request #34158 from quinton-hoole/2016-10-05-fix-ingress-bug-mac
41f17bd9 · Kubernetes Submit Queue · GitHub · 6a9d56b3 · 68c0c5dd · 41f17bd9
Commit 41f17bd9 authored Oct 06, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ingress_controller.go ...n/pkg/federation-controller/ingress/ingress_controller.go +1 -1

No files found.
--- a/federation/pkg/federation-controller/ingress/ingress_controller.go
+++ b/federation/pkg/federation-controller/ingress/ingress_controller.go
@@ -671,7 +671,7 @@ func (ic *IngressController) reconcileIngress(ingress types.NamespacedName) {
 					ClusterName: cluster.Name,
 				})
 			} else {
-				glog.V(4).Infof("No annotation %q exists on ingress %q in federation, and index of cluster %q is %d and not zero.  Not queueing create operation for ingress %q until annotation exists", staticIPNameKeyWritable, ingress, cluster.Name, clusterIndex)
+				glog.V(4).Infof("No annotation %q exists on ingress %q in federation, and index of cluster %q is %d and not zero.  Not queueing create operation for ingress %q until annotation exists", staticIPNameKeyWritable, ingress, cluster.Name, clusterIndex, ingress)
 			}
 		} else {
 			clusterIngress := clusterIngressObj.(*extensions_v1beta1.Ingress)