Merge pull request #568 from jcmoraisjr/jm-ann-approot-1

Revert merge annotations to the implicit root context
kubernetes · Apr 7, 2017 · cfef9d8 · cfef9d8
2 parents 7ca7652 + 239166b
commit cfef9d8
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go
@@ -623,12 +623,6 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress
 				server = servers[defServerName]
 			}
 
-			// Add annotations to location of default backend (root context)
-			if len(server.Locations) > 0 {
-				loc := server.Locations[0]
-				mergeLocationAnnotations(loc, anns)
-			}
-
 			if rule.HTTP == nil &&
 				host != defServerName {
 				glog.V(3).Infof("ingress rule %v/%v does not contain HTTP rules, using default backend", ing.Namespace, ing.Name)