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

be consistent with what Nginx supports

Browse source
This commit is contained in:
Elvin Efendi 2018-12-02 22:10:36 +04:00
parent ccd7b890fd
commit 4eabd535f9
3 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/ingress/controller/template/template.go
View file

@ -727,11 +727,15 @@ func buildNextUpstream(i, r interface{}) string {
return strings.Join(nextUpstreamCodes, " ")
}
var sizeUnitRegex = regexp.MustCompile("^[0-9]+[kKmMgG]{0,1}$")
// refer to http://nginx.org/en/docs/syntax.html
// Nginx differentiates between size and offset
// offset directives support gigabytes in addition
var nginxSizeRegex = regexp.MustCompile("^[0-9]+[kKmM]{0,1}$")
var nginxOffsetRegex = regexp.MustCompile("^[0-9]+[kKmMgG]{0,1}$")
// isValidByteSize validates size units valid in nginx
// http://nginx.org/en/docs/syntax.html
func isValidByteSize(input interface{}) bool {
func isValidByteSize(input interface{}, isOffset bool) bool {
s, ok := input.(string)
if !ok {
glog.Errorf("expected an 'string' type but %T was returned", input)
@ -744,7 +748,11 @@ func isValidByteSize(input interface{}) bool {
return false
}
return sizeUnitRegex.MatchString(s)
if isOffset {
return nginxOffsetRegex.MatchString(s)
}
return nginxSizeRegex.MatchString(s)
}
type ingressInformation struct {