Skip to content

Commit 114abe4

Browse files
committed
BUG: fix frontends management with rules
1 parent 4fe08ee commit 114abe4

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

controller/ingress/ingress.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,15 @@ func (i *Ingress) HandleAnnotations(k store.K8s, cfg *configuration.ControllerCf
159159
ingressRule = true
160160
}
161161
defaultFrontends := []string{cfg.FrontHTTP, cfg.FrontHTTPS}
162-
frontends := defaultFrontends
162+
163163
for _, a := range annotations.Frontend(i.resource, &result, *cfg.MapFiles) {
164164
err = a.Process(k, annList)
165165
if err != nil {
166166
logger.Errorf("%s: annotation %s: %s", annSource, a.GetName(), err)
167167
}
168168
}
169169
for _, rule := range result {
170+
frontends := defaultFrontends
170171
switch rule.GetType() {
171172
case rules.REQ_REDIRECT:
172173
redirRule := rule.(*rules.RequestRedirect)
@@ -182,8 +183,6 @@ func (i *Ingress) HandleAnnotations(k store.K8s, cfg *configuration.ControllerCf
182183
case rules.REQ_RATELIMIT:
183184
limitRule := rule.(*rules.ReqRateLimit)
184185
cfg.RateLimitTables = append(cfg.RateLimitTables, limitRule.TableName)
185-
default:
186-
frontends = defaultFrontends
187186
}
188187
for _, frontend := range frontends {
189188
logger.Error(cfg.HAProxyRules.AddRule(rule, ingressRule, frontend))

0 commit comments

Comments
 (0)