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

Merge pull request #3266 from Shopify/fix-backend-protocol

Browse source 
fix two bugs with backend-protocol annotation
This commit is contained in:
k8s-ci-robot 2018-10-19 06:41:25 -07:00 committed by GitHub
commit a3bf5dadaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/ingress/controller/controller.go
View file

@ -824,6 +824,7 @@ func (n *NGINXController) createServers(data []*extensions.Ingress,
defLoc.Denied = anns.Denied defLoc.Denied = anns.Denied
defLoc.LuaRestyWAF = anns.LuaRestyWAF defLoc.LuaRestyWAF = anns.LuaRestyWAF
defLoc.InfluxDB = anns.InfluxDB defLoc.InfluxDB = anns.InfluxDB
defLoc.BackendProtocol = anns.BackendProtocol
} else { } else {
glog.V(3).Infof("Ingress %q defines both a backend and rules. Using its backend as default upstream for all its rules.", glog.V(3).Infof("Ingress %q defines both a backend and rules. Using its backend as default upstream for all its rules.",
ingKey) ingKey)

4
internal/ingress/types_equals.go
View file

@ -341,6 +341,10 @@ func (l1 *Location) Equal(l2 *Location) bool {
return false return false
} }
if l1.BackendProtocol != l2.BackendProtocol {
return false
}
return true return true
} }