[GitHub] [apisix-ingress-controller] gxthrj commented on a change in pull request #236: chore: new apisix upstream controller

[GitBox <gi...@apache.org>]

gxthrj commented on a change in pull request #236:
URL: https://github.com/apache/apisix-ingress-controller/pull/236#discussion_r571520893



##########
File path: pkg/ingress/controller/apisix_upstream.go
##########
@@ -15,202 +15,244 @@
 package controller
 
 import (
-	"fmt"
-	"time"
-
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/kubernetes/scheme"
+	"context"
+
+	"go.uber.org/zap"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	"github.com/apache/apisix-ingress-controller/pkg/ingress/apisix"
-	"github.com/apache/apisix-ingress-controller/pkg/ingress/endpoint"
+	apisixcache "github.com/apache/apisix-ingress-controller/pkg/apisix/cache"
 	configv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v1"
-	clientset "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned"
-	apisixscheme "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/clientset/versioned/scheme"
-	informersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/informers/externalversions/config/v1"
-	listersv1 "github.com/apache/apisix-ingress-controller/pkg/kube/apisix/client/listers/config/v1"
 	"github.com/apache/apisix-ingress-controller/pkg/log"
-	"github.com/apache/apisix-ingress-controller/pkg/seven/state"
+	"github.com/apache/apisix-ingress-controller/pkg/types"
+	apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
 )
 
-type ApisixUpstreamController struct {
-	controller           *Controller
-	kubeclientset        kubernetes.Interface
-	apisixClientset      clientset.Interface
-	apisixUpstreamList   listersv1.ApisixUpstreamLister
-	apisixUpstreamSynced cache.InformerSynced
-	workqueue            workqueue.RateLimitingInterface
+type apisixUpstreamController struct {
+	controller *Controller
+	workqueue  workqueue.RateLimitingInterface
+	workers    int
 }
 
-func BuildApisixUpstreamController(
-	kubeclientset kubernetes.Interface,
-	apisixUpstreamClientset clientset.Interface,
-	apisixUpstreamInformer informersv1.ApisixUpstreamInformer,
-	root *Controller) *ApisixUpstreamController {
-
-	runtime.Must(apisixscheme.AddToScheme(scheme.Scheme))
-	controller := &ApisixUpstreamController{
-		controller:           root,
-		kubeclientset:        kubeclientset,
-		apisixClientset:      apisixUpstreamClientset,
-		apisixUpstreamList:   apisixUpstreamInformer.Lister(),
-		apisixUpstreamSynced: apisixUpstreamInformer.Informer().HasSynced,
-		workqueue:            workqueue.NewNamedRateLimitingQueue(workqueue.NewItemFastSlowRateLimiter(1*time.Second, 60*time.Second, 5), "ApisixUpstreams"),
-	}
-	apisixUpstreamInformer.Informer().AddEventHandler(
+func (c *Controller) newApisixUpstreamController() *apisixUpstreamController {
+	ctl := &apisixUpstreamController{
+		controller: c,
+		workqueue:  workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "ApisixUpstream"),
+		workers:    1,

Review comment:
       If we add workers here, had better config it in yaml.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org