Support for multiple HTTP verbs in routes/HTTPTrigger (#2064)

* Support for multiple HTTP verbs in routes/HTTPTrigger

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Update pkg/apis/core/v1/types.go

Co-authored-by: Harsh Thakur <harshthakur9030@gmail.com>

* Fix fallbackurl for ingress

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

Co-authored-by: Harsh Thakur <harshthakur9030@gmail.com>

pkg/canaryconfigmgr/canaryConfigMgr.go

@@ -282,9 +282,21 @@ func (canaryCfgMgr *canaryConfigMgr) RollForwardOrBack(canaryConfig *fv1.CanaryC
 		} else {
 			urlPath = triggerObj.Spec.RelativeURL
 		}
-		failurePercent, err := canaryCfgMgr.promClient.GetFunctionFailurePercentage(urlPath, triggerObj.Spec.Method,
+		methods := triggerObj.Spec.Methods
+		if len(triggerObj.Spec.Method) > 0 {
+			present := false
+			for _, m := range triggerObj.Spec.Methods {
+				if m == triggerObj.Spec.Method {
+					present = true
+					break
+				}
+			}
+			if !present {
+				methods = append(methods, triggerObj.Spec.Method)
+			}
+		}
+		failurePercent, err := canaryCfgMgr.promClient.GetFunctionFailurePercentage(urlPath, methods,
 			canaryConfig.Spec.NewFunction, canaryConfig.ObjectMeta.Namespace, canaryConfig.Spec.WeightIncrementDuration)
-
 		if err != nil {
 			// silently ignore. wait for next window to increment weight
 			canaryCfgMgr.logger.Error("error calculating failure percentage",

pkg/canaryconfigmgr/prometheusClient.go

@@ -51,21 +51,28 @@ func MakePrometheusClient(logger *zap.Logger, prometheusSvc string) (*Prometheus
 	}, nil
 }
 
-func (promApiClient *PrometheusApiClient) GetFunctionFailurePercentage(path, method, funcName, funcNs string, window string) (float64, error) {
+func (promApiClient *PrometheusApiClient) GetFunctionFailurePercentage(path string, methods []string, funcName, funcNs string, window string) (float64, error) {
+	var reqs, failedReqs float64
 	// first get a total count of requests to this url in a time window
-	reqs, err := promApiClient.GetRequestsToFuncInWindow(path, method, funcName, funcNs, window)
-	if err != nil {
-		return 0, err
+	for _, method := range methods {
+		mreqs, err := promApiClient.GetRequestsToFuncInWindow(path, method, funcName, funcNs, window)
+		if err != nil {
+			return 0, err
+		}
+		reqs += mreqs
 	}
 
 	if reqs <= 0 {
-		return -1, fmt.Errorf("no requests to this url %v and method %v in the window: %v", path, method, window)
+		return -1, fmt.Errorf("no requests to this url %v and method %v in the window: %v", path, methods, window)
 	}
 
 	// next, get a total count of errored out requests to this function in the same window
-	failedReqs, err := promApiClient.GetTotalFailedRequestsToFuncInWindow(funcName, funcNs, path, method, window)
-	if err != nil {
-		return 0, err
+	for _, method := range methods {
+		mfailedReqs, err := promApiClient.GetTotalFailedRequestsToFuncInWindow(funcName, funcNs, path, method, window)
+		if err != nil {
+			return 0, err
+		}
+		failedReqs += mfailedReqs
 	}
 
 	// calculate the failure percentage of the function