DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1095 from zjj2wry/whilelist

Browse source 
Fix(#1096) ingress annotation can not set ip in whitelist
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-08-21 18:46:15 -04:00 • committed by GitHub
commit 1da974f16b
3 changed files with 93 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/pkg/ingress/annotations/ipwhitelist/main.go
View file

@ -23,7 +23,7 @@ import (
"github.com/pkg/errors"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/kubernetes/pkg/util/net/sets"
"k8s.io/ingress/core/pkg/net"
"k8s.io/ingress/core/pkg/ingress/annotations/parser"
ing_errors "k8s.io/ingress/core/pkg/ingress/errors"
@ -92,8 +92,8 @@ func (a ipwhitelist) Parse(ing *extensions.Ingress) (interface{}, error) {
}
values := strings.Split(val, ",")
ipnets, err := sets.ParseIPNets(values...)
if err != nil {
ipnets, ips, err := net.ParseIPNets(values...)
if err != nil && len(ips) == 0 {
return &SourceRange{CIDR: defBackend.WhitelistSourceRange}, ing_errors.LocationDenied{
Reason: errors.Wrap(err, "the annotation does not contain a valid IP address or network"),
}
@ -103,6 +103,9 @@ func (a ipwhitelist) Parse(ing *extensions.Ingress) (interface{}, error) {
for k := range ipnets {
cidrs = append(cidrs, k)
}
for k := range ips {
cidrs = append(cidrs, k)
}
sort.Strings(cidrs)