Skip to content

Ignore Ingress resources with empty hostnames #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2017
Merged

Ignore Ingress resources with empty hostnames #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions nginx-controller/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,11 +789,17 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) (*ngin
}
}

validRules := 0

for _, rule := range ing.Spec.Rules {
if rule.IngressRuleValue.HTTP == nil {
continue
}

if rule.Host == "" {
return nil, fmt.Errorf("Ingress rule contains empty host")
}

for _, path := range rule.HTTP.Paths {
endps, err := lbc.getEndpointsForIngressBackend(&path.Backend, ing.Namespace)
if err != nil {
Expand All @@ -803,6 +809,12 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) (*ngin
ingEx.Endpoints[path.Backend.ServiceName+path.Backend.ServicePort.String()] = endps
}
}

validRules++
}

if validRules == 0 {
return nil, fmt.Errorf("Ingress contains no valid rules")
}

return ingEx, nil
Expand Down
43 changes: 0 additions & 43 deletions nginx-controller/nginx/configurator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@ func (cnf *Configurator) generateNginxCfg(ingEx *IngressEx, pems map[string]stri
serverName := rule.Host

statuzZone := rule.Host
if rule.Host == emptyHost {
statuzZone = ingEx.Ingress.Namespace + "-" + ingEx.Ingress.Name
glog.Warningf("Host field of ingress rule in %v/%v is empty", ingEx.Ingress.Namespace, ingEx.Ingress.Name)
}

server := Server{
Name: serverName,
Expand Down Expand Up @@ -155,45 +151,6 @@ func (cnf *Configurator) generateNginxCfg(ingEx *IngressEx, pems map[string]stri
servers = append(servers, server)
}

if len(ingEx.Ingress.Spec.Rules) == 0 && ingEx.Ingress.Spec.Backend != nil {
serverName := emptyHost
statuzZone := ingEx.Ingress.Namespace + "-" + ingEx.Ingress.Name
glog.Warningf("Host field of ingress rule in %v/%v is empty", ingEx.Ingress.Namespace, ingEx.Ingress.Name)
server := Server{
Name: serverName,
ServerTokens: ingCfg.ServerTokens,
HTTP2: ingCfg.HTTP2,
RedirectToHTTPS: ingCfg.RedirectToHTTPS,
ProxyProtocol: ingCfg.ProxyProtocol,
HSTS: ingCfg.HSTS,
HSTSMaxAge: ingCfg.HSTSMaxAge,
HSTSIncludeSubdomains: ingCfg.HSTSIncludeSubdomains,
StatusZone: statuzZone,
RealIPHeader: ingCfg.RealIPHeader,
SetRealIPFrom: ingCfg.SetRealIPFrom,
RealIPRecursive: ingCfg.RealIPRecursive,
ProxyHideHeaders: ingCfg.ProxyHideHeaders,
ProxyPassHeaders: ingCfg.ProxyPassHeaders,
ServerSnippets: ingCfg.ServerSnippets,
}

if pemFile, ok := pems[emptyHost]; ok {
server.SSL = true
server.SSLCertificate = pemFile
server.SSLCertificateKey = pemFile
}

var locations []Location

upsName := getNameForUpstream(ingEx.Ingress, emptyHost, ingEx.Ingress.Spec.Backend.ServiceName)

loc := createLocation(pathOrDefault("/"), upstreams[upsName], &ingCfg, wsServices[ingEx.Ingress.Spec.Backend.ServiceName], rewrites[ingEx.Ingress.Spec.Backend.ServiceName], sslServices[ingEx.Ingress.Spec.Backend.ServiceName])
locations = append(locations, loc)

server.Locations = locations
servers = append(servers, server)
}

return IngressNginxConfig{Upstreams: upstreamMapToSlice(upstreams), Servers: servers}
}

Expand Down
2 changes: 0 additions & 2 deletions nginx-controller/nginx/templates/nginx-plus.ingress.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ server {

server_tokens "{{$server.ServerTokens}}";

{{if $server.Name}}
server_name {{$server.Name}};
{{end}}

status_zone {{$server.StatusZone}};

Expand Down
3 changes: 1 addition & 2 deletions nginx-controller/nginx/templates/nginx.ingress.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ server {

server_tokens {{$server.ServerTokens}};

{{if $server.Name}}
server_name {{$server.Name}};
{{end}}

{{range $proxyHideHeader := $server.ProxyHideHeaders}}
proxy_hide_header {{$proxyHideHeader}};{{end}}
{{range $proxyPassHeader := $server.ProxyPassHeaders}}
Expand Down