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

Refactor handling of path Prefix and Exact

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-11-08 11:30:43 -03:00
parent 52726abaee
commit 3f153add00
10 changed files with 316 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -317,26 +317,16 @@ func locationConfigForLua(l interface{}, a interface{}) string {
return "{}"
}
pathType := ""
if location.PathType != nil {
pathType = fmt.Sprintf("%v", *location.PathType)
}
if needsRewrite(location) || location.Rewrite.UseRegex {
pathType = ""
}
return fmt.Sprintf(`{
force_ssl_redirect = %t,
ssl_redirect = %t,
force_no_ssl_redirect = %t,
use_port_in_redirects = %t,
path_type = "%v",
}`,
location.Rewrite.ForceSSLRedirect,
location.Rewrite.SSLRedirect,
isLocationInLocationList(l, all.Cfg.NoTLSRedirectLocations),
location.UsePortInRedirects,
pathType,
)
}
@ -417,7 +407,7 @@ func buildLocation(input interface{}, enforceRegex bool) string {
}
if location.PathType != nil && *location.PathType == networkingv1beta1.PathTypeExact {
return fmt.Sprintf(`~ ^%s$`, path)
return fmt.Sprintf(`= %s`, path)
}
return path