@@ -214,25 +214,25 @@ func parseCidrs(ing parser.AnnotationInterface) (v4CIDRs, v6CIDRs []string, err
214
214
}
215
215
216
216
for _ , inboundCidr := range cidrConfig {
217
- ip , _ , err := net .ParseCIDR (inboundCidr )
217
+ _ , _ , err := net .ParseCIDR (inboundCidr )
218
218
if err != nil {
219
219
return v4CIDRs , v6CIDRs , err
220
220
}
221
221
222
- if ip . To4 () == nil {
222
+ if strings . Contains ( inboundCidr , ":" ) {
223
223
v6CIDRs = append (v6CIDRs , inboundCidr )
224
224
} else {
225
225
v4CIDRs = append (v4CIDRs , inboundCidr )
226
226
}
227
227
}
228
228
229
- if len (v4CIDRs ) == 0 {
229
+ if len (v4CIDRs ) == 0 && len ( v6CIDRs ) == 0 {
230
230
v4CIDRs = append (v4CIDRs , "0.0.0.0/0" )
231
- }
232
231
233
- addrType , _ := parser .GetStringAnnotation ("ip-address-type" , ing )
234
- if addrType != nil && * addrType == elbv2 .IpAddressTypeDualstack && len (v6CIDRs ) == 0 {
235
- v6CIDRs = append (v6CIDRs , "::/0" )
232
+ addrType , _ := parser .GetStringAnnotation ("ip-address-type" , ing )
233
+ if addrType != nil && * addrType == elbv2 .IpAddressTypeDualstack {
234
+ v6CIDRs = append (v6CIDRs , "::/0" )
235
+ }
236
236
}
237
237
238
238
return v4CIDRs , v6CIDRs , nil
0 commit comments