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

keep zones unique per ingress resource

Browse source
This commit is contained in:
Seth Pollack 2017-08-22 14:53:53 -04:00
parent ed3803cf58
commit a3594f6c4c
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
controllers/nginx/pkg/template/template.go
View file

@ -133,6 +133,7 @@ var (
"buildAuthResponseHeaders": buildAuthResponseHeaders,
"buildProxyPass": buildProxyPass,
"buildWhitelistVariable": buildWhitelistVariable,
"whitelistExists": whitelistExists,
"buildRateLimitZones": buildRateLimitZones,
"buildRateLimit": buildRateLimit,
"buildResolvers": buildResolvers,
@ -340,6 +341,11 @@ var (
whitelistVarMap = map[string]string{}
)
func whitelistExists(s string) bool {
_, ok := whitelistVarMap[s]
return ok
}
func buildWhitelistVariable(s string) string {
if _, ok := whitelistVarMap[s]; !ok {
whitelistVarMap[s] = buildRandomUUID()
@ -360,8 +366,7 @@ func buildRateLimitZones(input interface{}) []string {
for _, server := range servers {
for _, loc := range server.Locations {
lrn := fmt.Sprintf("%v_%v", server.Hostname, loc.RateLimit.Name)
whitelistVar := buildWhitelistVariable(lrn)
whitelistVar := buildWhitelistVariable(loc.RateLimit.Name)
if loc.RateLimit.Connections.Limit > 0 {
zone := fmt.Sprintf("limit_conn_zone $limit_%s zone=%v:%vm;",