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

Fix ingress class

Browse source
This commit is contained in:
Giancarlo Rubio 2017-03-02 16:50:31 +01:00
parent f5f9f5e9c8
commit 2ddba72baa
6 changed files with 65 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
controllers/nginx/pkg/cmd/controller/nginx.go
View file

@ -48,9 +48,10 @@ const (
)
var (
tmplPath = "/etc/nginx/template/nginx.tmpl"
cfgPath = "/etc/nginx/nginx.conf"
binary = "/usr/sbin/nginx"
tmplPath = "/etc/nginx/template/nginx.tmpl"
cfgPath = "/etc/nginx/nginx.conf"
binary = "/usr/sbin/nginx"
defIngressClass = "nginx"
)
// newNGINXController creates a new NGINX Ingress controller.
@ -256,7 +257,12 @@ func (n NGINXController) Info() *ingress.BackendInfo {
// OverrideFlags customize NGINX controller flags
func (n NGINXController) OverrideFlags(flags *pflag.FlagSet) {
flags.Set("ingress-class", "nginx")
flags.Set("ingress-class", defIngressClass)
}
// DefaultIngressClass just return the default ingress class
func (n NGINXController) DefaultIngressClass() string {
return defIngressClass
}
// testTemplate checks if the NGINX configuration inside the byte array is valid