Skip to content

Commit 9a218d9

Browse files
committed
fix(ingress): correct types for getFrontendNlbAttributes
1 parent d4d8428 commit 9a218d9

File tree

2 files changed

+6
-76
lines changed

2 files changed

+6
-76
lines changed

pkg/ingress/model_build_frontend_nlb.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func (t *defaultModelBuildTask) buildFrontendNlbAttributes(ctx context.Context)
220220
return shared_utils.MakeAttributesSliceFromMap(loadBalancerAttributes), nil
221221
}
222222

223-
func (t *defaultModelBuildTask) getFrontendNlbAttributes() (any, any) {
223+
func (t *defaultModelBuildTask) getFrontendNlbAttributes() (map[string]string, error) {
224224
var chosenAttributes map[string]string
225225
for _, member := range t.ingGroup.Members {
226226
var attributes map[string]string
@@ -236,16 +236,16 @@ func (t *defaultModelBuildTask) getFrontendNlbAttributes() (any, any) {
236236
}
237237
}
238238

239-
dnsRecordClientRoutingPolicy, exists := chosenAttributes[lbAttrsLoadBalancingDnsClientRoutingPolicy]
239+
dnsRecordClientRoutingPolicy, exists := chosenAttributes[shared_constants.LBAttributeLoadBalancingDnsClientRoutingPolicy]
240240
if exists {
241241
switch dnsRecordClientRoutingPolicy {
242-
case availabilityZoneAffinity:
243-
case partialAvailabilityZoneAffinity:
244-
case anyAvailabilityZone:
242+
case shared_constants.LBAttributeAvailabilityZoneAffinity:
243+
case shared_constants.LBAttributePartialAvailabilityZoneAffinity:
244+
case shared_constants.LBAttributeAnyAvailabilityZone:
245245
default:
246246
return nil, errors.Errorf("invalid dns_record.client_routing_policy set in annotation %s: got '%s' expected one of ['%s', '%s', '%s']",
247247
annotations.SvcLBSuffixLoadBalancerAttributes, dnsRecordClientRoutingPolicy,
248-
anyAvailabilityZone, partialAvailabilityZoneAffinity, availabilityZoneAffinity)
248+
shared_constants.LBAttributeAnyAvailabilityZone, shared_constants.LBAttributePartialAvailabilityZoneAffinity, shared_constants.LBAttributeAvailabilityZoneAffinity)
249249
}
250250
}
251251
return chosenAttributes, nil

pkg/shared_utils/attribute_utils_test.go

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)