Make webhook cover ApisixRoute v2beta2 (#705)

apache · Oct 9, 2021 · 6f46ac2 · 6f46ac2
1 parent 9dd4f40
commit 6f46ac2
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/pkg/api/validation/apisix_route.go b/pkg/api/validation/apisix_route.go
@@ -31,6 +31,7 @@ import (
 	v1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2alpha1"
 	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta1"
+	"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta2"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
 )
 
@@ -53,7 +54,7 @@ var ApisixRouteValidator = kwhvalidating.ValidatorFunc(
 		var spec interface{}
 
 		switch ar := object.(type) {
-		case *v2beta1.ApisixRoute:
+		case *v2beta2.ApisixRoute:
 			spec = ar.Spec
 
 			// validate plugins
@@ -67,6 +68,18 @@ var ApisixRouteValidator = kwhvalidating.ValidatorFunc(
 					}
 				}
 			}
+		case *v2beta1.ApisixRoute:
+			spec = ar.Spec
+
+			for _, h := range ar.Spec.HTTP {
+				for _, p := range h.Plugins {
+					if p.Enable {
+						plugins = append(plugins, apisixRoutePlugin{
+							p.Name, p.Config,
+						})
+					}
+				}
+			}
 		case *v2alpha1.ApisixRoute:
 			spec = ar.Spec