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

fix two bugs with backend-protocol annotation

internal/ingress/controller/controller.go

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

internal/ingress/types_equals.go

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