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

Merge pull request #1398 from decker502/server-snippet

Browse source 
Surpport snippet for server section by the annotation of the ingess
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-09-27 10:44:07 -07:00 • committed by GitHub
commit 75cccbbd32
6 changed files with 129 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/pkg/ingress/controller/controller.go
View file

@ -988,6 +988,7 @@ func (ic *GenericController) createServers(data []*extensions.Ingress,
for _, ing := range data {
// setup server-alias based on annotations
aliasAnnotation := ic.annotations.Alias(ing)
srvsnippet := ic.annotations.ServerSnippet(ing)
for _, rule := range ing.Spec.Rules {
host := rule.Host
@ -1003,6 +1004,17 @@ func (ic *GenericController) createServers(data []*extensions.Ingress,
}
}
//notifying the user that it has already been configured.
if servers[host].ServerSnippet != "" && srvsnippet != "" {
glog.Warningf("ingress %v/%v for host %v contains a Server Snippet section that it has already been configured.",
ing.Namespace, ing.Name, host)
}
// only add a server snippet if the server does not have one previously configured
if servers[host].ServerSnippet == "" && srvsnippet != "" {
servers[host].ServerSnippet = srvsnippet
}
// only add a certificate if the server does not have one previously configured
if servers[host].SSLCertificate != "" {
continue
@ -1066,6 +1078,7 @@ func (ic *GenericController) createServers(data []*extensions.Ingress,
servers[host].Alias = ""
}
}
return servers
}