Skip to content

Commit b766f15

Browse files
ivanmatmatiMo3m3n
authored andcommitted
BUG/MINOR: fix frontends management with rules
1 parent 8ea17c4 commit b766f15

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
@@ -147,14 +147,15 @@ func (i *Ingress) HandleAnnotations(k store.K8s, cfg *configuration.ControllerCf
147147
ingressRule = true
148148
}
149149
defaultFrontends := []string{cfg.FrontHTTP, cfg.FrontHTTPS}
150-
frontends := defaultFrontends
150+
151151
for _, a := range annotations.Frontend(i.resource, &result, *cfg.MapFiles) {
152152
err = a.Process(k, annList)
153153
if err != nil {
154154
logger.Errorf("%s: annotation %s: %s", annSource, a.GetName(), err)
155155
}
156156
}
157157
for _, rule := range result {
158+
frontends := defaultFrontends
158159
switch rule.GetType() {
159160
case rules.REQ_REDIRECT:
160161
redirRule := rule.(*rules.RequestRedirect)
@@ -170,8 +171,6 @@ func (i *Ingress) HandleAnnotations(k store.K8s, cfg *configuration.ControllerCf
170171
case rules.REQ_RATELIMIT:
171172
limitRule := rule.(*rules.ReqRateLimit)
172173
cfg.RateLimitTables = append(cfg.RateLimitTables, limitRule.TableName)
173-
default:
174-
frontends = defaultFrontends
175174
}
176175
for _, frontend := range frontends {
177176
logger.Error(cfg.HAProxyRules.AddRule(rule, ingressRule, frontend))

0 commit comments

Comments
 (0)