feat: make multiple controllers handle different ApisixRoute CRDs

cmd/ingress/ingress.go

@@ -143,7 +143,7 @@ the apisix cluster and others are created`,
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.Kubeconfig, "kubeconfig", "", "Kubernetes configuration file (by default in-cluster configuration will be used)")
 	cmd.PersistentFlags().DurationVar(&cfg.Kubernetes.ResyncInterval.Duration, "resync-interval", time.Minute, "the controller resync (with Kubernetes) interval, the minimum resync interval is 30s")
 	cmd.PersistentFlags().StringSliceVar(&cfg.Kubernetes.AppNamespaces, "app-namespace", []string{config.NamespaceAll}, "namespaces that controller will watch for resources")
-	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.IngressClass, "ingress-class", config.IngressClass, "the class of an Ingress object is set using the field IngressClassName in Kubernetes clusters version v1.18.0 or higher or the annotation \"kubernetes.io/ingress.class\" (deprecated)")
+	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.IngressClass, "ingress-class", config.IngressClass, "the class of an Ingress object is set using the field IngressClassName in Kubernetes clusters version v1.18.0 or higher or the annotation \"kubernetes.io/ingress.class\" (deprecated). a wildcard '*' listen all ApisixRoutes or Ingress")
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ElectionID, "election-id", config.IngressAPISIXLeader, "election id used for campaign the controller leader")
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.IngressVersion, "ingress-version", config.IngressNetworkingV1, "the supported ingress api group version, can be \"networking/v1beta1\", \"networking/v1\" (for Kubernetes version v1.19.0 or higher) and \"extensions/v1beta1\"")
 	cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ApisixRouteVersion, "apisix-route-version", config.ApisixRouteV2alpha1, "the supported apisixroute api group version, can be \"apisix.apache.org/v1\" or \"apisix.apache.org/v2alpha1\"")

pkg/ingress/apisix_route.go

@@ -292,6 +292,26 @@ func (c *apisixRouteController) handleSyncErr(obj interface{}, errOrigin error)
 	c.workqueue.AddRateLimited(obj)
 }
 
+func (c *apisixRouteController) isApisixRouteEffective(ar kube.ApisixRoute) bool {
+	var class string
+
+	if ar.GroupVersion() == kube.ApisixRouteV1 {
+		class = ar.V1().Spec.IngressClass
+	} else if ar.GroupVersion() == kube.ApisixRouteV2alpha1 {
+		class = ar.V2alpha1().Spec.IngressClass
+	} else if ar.GroupVersion() == kube.ApisixRouteV2beta1 {
+		class = ar.V2beta1().Spec.IngressClass
+	} else {
+		class = c.controller.cfg.Kubernetes.IngressClass
+	}
+
+	if c.controller.cfg.Kubernetes.IngressClass == "*" || c.controller.cfg.Kubernetes.IngressClass == class {
+		return true
+	}
+
+	return false
+}
+
 func (c *apisixRouteController) onAdd(obj interface{}) {
 	key, err := cache.MetaNamespaceKeyFunc(obj)
 	if err != nil {
@@ -301,10 +321,19 @@ func (c *apisixRouteController) onAdd(obj interface{}) {
 	if !c.controller.namespaceWatching(key) {
 		return
 	}
+
+	ar := kube.MustNewApisixRoute(obj)
+
+	if !c.isApisixRouteEffective(ar) {
+		log.Debugw("ignore noneffective ApisixRoute add event",
+			zap.Any("object", obj),
+		)
+		return
+	}
+
 	log.Debugw("ApisixRoute add event arrived",
 		zap.Any("object", obj))
 
-	ar := kube.MustNewApisixRoute(obj)
 	c.workqueue.AddRateLimited(&types.Event{
 		Type: types.EventAdd,
 		Object: kube.ApisixRouteEvent{
@@ -328,6 +357,13 @@ func (c *apisixRouteController) onUpdate(oldObj, newObj interface{}) {
 	if !c.controller.namespaceWatching(key) {
 		return
 	}
+	if !c.isApisixRouteEffective(curr) {
+		log.Debugw("ignore noneffective ApisixRoute update event arrived",
+			zap.Any("new object", curr),
+			zap.Any("old object", prev),
+		)
+		return
+	}
 	log.Debugw("ApisixRoute update event arrived",
 		zap.Any("new object", curr),
 		zap.Any("old object", prev),
@@ -359,6 +395,12 @@ func (c *apisixRouteController) onDelete(obj interface{}) {
 	if !c.controller.namespaceWatching(key) {
 		return
 	}
+	if !c.isApisixRouteEffective(ar) {
+		log.Debugw("ignore noneffective ApisixRoute delete event arrived",
+			zap.Any("final state", ar),
+		)
+		return
+	}
 	log.Debugw("ApisixRoute delete event arrived",
 		zap.Any("final state", ar),
 	)

pkg/ingress/ingress.go

@@ -304,6 +304,9 @@ func (c *ingressController) isIngressEffective(ing kube.Ingress) bool {
 		ic  *string
 		ica string
 	)
+	if c.controller.cfg.Kubernetes.IngressClass == "*" {
+		return true
+	}
 	if ing.GroupVersion() == kube.IngressV1 {
 		ic = ing.V1().Spec.IngressClassName
 		ica = ing.V1().GetAnnotations()[_ingressKey]

pkg/kube/apisix/apis/config/v1/types.go

@@ -39,7 +39,8 @@ type ApisixRoute struct {
 
 // ApisixRouteSpec is the spec definition for ApisixRouteSpec.
 type ApisixRouteSpec struct {
-	Rules []Rule `json:"rules,omitempty" yaml:"rules,omitempty"`
+	IngressClass string `json:"ingressClass,omitempty" yaml:"ingressClass,omitempty"`
+	Rules        []Rule `json:"rules,omitempty" yaml:"rules,omitempty"`
 }
 
 // Rule represents a single route rule in ApisixRoute.

pkg/kube/apisix/apis/config/v2alpha1/types.go

@@ -78,8 +78,9 @@ type ApisixStatus struct {
 
 // ApisixRouteSpec is the spec definition for ApisixRouteSpec.
 type ApisixRouteSpec struct {
-	HTTP []*ApisixRouteHTTP `json:"http,omitempty" yaml:"http,omitempty"`
-	TCP  []*ApisixRouteTCP  `json:"tcp,omitempty" yaml:"tcp,omitempty"`
+	IngressClass string             `json:"ingressClass,omitempty" yaml:"ingressClass,omitempty"`
+	HTTP         []*ApisixRouteHTTP `json:"http,omitempty" yaml:"http,omitempty"`
+	TCP          []*ApisixRouteTCP  `json:"tcp,omitempty" yaml:"tcp,omitempty"`
 }
 
 // ApisixRouteHTTP represents a single route in for HTTP traffic.

pkg/kube/apisix/apis/config/v2beta1/types.go

@@ -41,8 +41,9 @@ type ApisixStatus struct {
 
 // ApisixRouteSpec is the spec definition for ApisixRouteSpec.
 type ApisixRouteSpec struct {
-	HTTP   []ApisixRouteHTTP   `json:"http,omitempty" yaml:"http,omitempty"`
-	Stream []ApisixRouteStream `json:"stream,omitempty" yaml:"stream,omitempty"`
+	IngressClass string              `json:"ingressClass,omitempty" yaml:"ingressClass,omitempty"`
+	HTTP         []ApisixRouteHTTP   `json:"http,omitempty" yaml:"http,omitempty"`
+	Stream       []ApisixRouteStream `json:"stream,omitempty" yaml:"stream,omitempty"`
 }
 
 // ApisixRouteHTTP represents a single route in for HTTP traffic.

samples/deploy/crd/v1beta1/ApisixRoute.yaml

@@ -72,6 +72,8 @@ spec:
             - required: ["tcp"]
             - required: ["stream"]
           properties:
+            ingressClass:
+              type: string
             http:
               type: array
               minItems: 1