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
This commit is contained in:
Kubernetes Submit Queue 2016-10-06 11:43:58 -07:00 committed by GitHub
commit 41f17bd9ac

View File

@ -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)