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

Always listen on port 443, even without ingress rules

Browse source
This commit is contained in:
Manuel de Brito Fontes 2016-08-22 10:48:42 -03:00
parent 727a62421e
commit 4f92eb9da2
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
controllers/nginx/controller.go
View file

@ -669,22 +669,7 @@ func (lbc *loadBalancerController) getDefaultUpstream() *nginx.Upstream {
func (lbc *loadBalancerController) getUpstreamServers(ngxCfg config.Configuration, data []interface{}) ([]*nginx.Upstream, []*nginx.Server) {
upstreams := lbc.createUpstreams(ngxCfg, data)
upstreams[defUpstreamName] = lbc.getDefaultUpstream()
servers := lbc.createServers(data)
if _, ok := servers[defServerName]; !ok {
// default server - no servername.
// there is no rule with default backend
servers[defServerName] = &nginx.Server{
Name: defServerName,
Locations: []*nginx.Location{{
Path: rootLocation,
IsDefBackend: true,
Upstream: *lbc.getDefaultUpstream(),
},
},
}
}
for _, ingIf := range data {
ing := ingIf.(*extensions.Ingress)
@ -728,7 +713,7 @@ func (lbc *loadBalancerController) getUpstreamServers(ngxCfg config.Configuratio
}
server := servers[host]
if server == nil {
server = servers["_"]
server = servers[defServerName]
}
for _, path := range rule.HTTP.Paths {
@ -811,6 +796,7 @@ func (lbc *loadBalancerController) getUpstreamServers(ngxCfg config.Configuratio
// Ingress rules. The servers inside the upstream are endpoints.
func (lbc *loadBalancerController) createUpstreams(ngxCfg config.Configuration, data []interface{}) map[string]*nginx.Upstream {
upstreams := make(map[string]*nginx.Upstream)
upstreams[defUpstreamName] = lbc.getDefaultUpstream()
for _, ingIf := range data {
ing := ingIf.(*extensions.Ingress)
@ -882,10 +868,22 @@ func (lbc *loadBalancerController) createServers(data []interface{}) map[string]
ngxCert, err = lbc.getPemCertificate(lbc.defSSLCertificate)
}
locs := []*nginx.Location{}
locs = append(locs, &nginx.Location{
Path: rootLocation,
IsDefBackend: true,
Upstream: *lbc.getDefaultUpstream(),
})
servers[defServerName] = &nginx.Server{Name: defServerName, Locations: locs}
if err == nil {
pems["_"] = ngxCert
pems[defServerName] = ngxCert
servers[defServerName].SSL = true
servers[defServerName].SSLCertificate = ngxCert.PemFileName
servers[defServerName].SSLCertificateKey = ngxCert.PemFileName
servers[defServerName].SSLPemChecksum = ngxCert.PemSHA
} else {
glog.Warningf("%v", err)
glog.Warningf("unexpected error reading default SSL certificate: %v", err)
}
for _, ingIf := range data {