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

Merge pull request #716 from jcmoraisjr/jm-secure-ca

Browse source 
Add secure-verify-ca-secret annotation
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-05-17 07:41:13 -04:00 • committed by GitHub
commit 3dc7717a68
6 changed files with 144 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -784,7 +784,10 @@ func (ic *GenericController) createUpstreams(data []interface{}) map[string]*ing
glog.V(3).Infof("creating upstream %v", name)
upstreams[name] = newUpstream(name)
if !upstreams[name].Secure {
upstreams[name].Secure = secUpstream
upstreams[name].Secure = secUpstream.Secure
}
if upstreams[name].SecureCACert.Secret == "" {
upstreams[name].SecureCACert = secUpstream.CACert
}
if upstreams[name].SessionAffinity.AffinityType == "" {
upstreams[name].SessionAffinity.AffinityType = affinity.AffinityType