From 239166b4b78a9bf3de0bbf2d4a059658b28ef7a9 Mon Sep 17 00:00:00 2001 From: Joao Morais Date: Thu, 6 Apr 2017 22:18:51 -0300 Subject: [PATCH] Revert merge annotations to the implicit root context --- core/pkg/ingress/controller/controller.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go index 4a1b8d5e3..9f803625d 100644 --- 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)