Skip to content

Commit bf1a6be

Browse files
committed
change default group.order to be 0
1 parent 5db1a2f commit bf1a6be

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

pkg/ingress/group_builder.go

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@ package ingress
22

33
import (
44
"context"
5+
"sort"
6+
57
"github.com/pkg/errors"
68
extensions "k8s.io/api/extensions/v1beta1"
79
k8serr "k8s.io/apimachinery/pkg/api/errors"
810
"k8s.io/apimachinery/pkg/types"
911
"k8s.io/apimachinery/pkg/util/sets"
10-
"math"
1112
"sigs.k8s.io/aws-alb-ingress-controller/pkg/k8s"
1213
"sigs.k8s.io/controller-runtime/pkg/cache"
13-
"sort"
14+
)
15+
16+
const (
17+
defaultGroupOrder int64 = 0
18+
minGroupOrder = 1
19+
maxGroupOrder = 1000
1420
)
1521

1622
type GroupBuilder interface {
@@ -133,14 +139,18 @@ func (m *defaultGroupBuilder) sortIngresses(ingList []*extensions.Ingress) ([]*e
133139

134140
explicitOrders := sets.NewInt64()
135141
for _, ing := range ingList {
136-
var order int64 = math.MaxInt64
142+
var order = defaultGroupOrder;
137143
exists, err := m.annotationParser.ParseInt64Annotation(k8s.AnnotationSuffixGroupOrder, &order, ing.Annotations)
138144
if err != nil {
139-
return nil, errors.Wrapf(err, "failed to load ingressgroup order for ingress: %v", k8s.NamespacedName(ing))
145+
return nil, errors.Wrapf(err, "failed to load ingress group order for ingress: %v", k8s.NamespacedName(ing))
140146
}
141147
if exists {
148+
if order < minGroupOrder || order > maxGroupOrder {
149+
return nil, errors.Errorf("explicit ingress group order must be within [%v:%v], order: %v, ingress: %v", minGroupOrder, maxGroupOrder, order, k8s.NamespacedName(ing))
150+
}
151+
142152
if explicitOrders.Has(order) {
143-
return nil, errors.Errorf("conflict ingressgroup order: %v", order)
153+
return nil, errors.Errorf("conflict explicit ingress group order: %v", order)
144154
}
145155
explicitOrders.Insert(order)
146156
}

0 commit comments

Comments
 (0)