feat: support httproute (#43)

Author: AlinsRan

api/dashboard/v1/types.go

@@ -108,6 +108,18 @@ type Metadata struct {
 	Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
 }
 
+func (m *Metadata) GetID() string {
+	return m.ID
+}
+
+func (m *Metadata) GetName() string {
+	return m.Name
+}
+
+func (m *Metadata) GetLabels() map[string]string {
+	return m.Labels
+}
+
 // Upstream is the apisix upstream definition.
 // +k8s:deepcopy-gen=true
 type Upstream struct {
@@ -615,31 +627,41 @@ func NewDefaultGlobalRule() *GlobalRule {
 // ComposeUpstreamName uses namespace, name, subset (optional), port, resolveGranularity info to compose
 // the upstream name.
 // the resolveGranularity is not composited in the upstream name when it is endpoint.
-func ComposeUpstreamName(namespace, name, subset string, port int32, resolveGranularity string) string {
+func ComposeUpstreamName(namespace, name string, port int32) string {
 	pstr := strconv.Itoa(int(port))
 	// FIXME Use sync.Pool to reuse this buffer if the upstream
 	// name composing code path is hot.
 	var p []byte
 	plen := len(namespace) + len(name) + len(pstr) + 2
-	if subset != "" {
-		plen = plen + len(subset) + 1
-	}
 
 	p = make([]byte, 0, plen)
 	buf := bytes.NewBuffer(p)
 	buf.WriteString(namespace)
 	buf.WriteByte('_')
 	buf.WriteString(name)
 	buf.WriteByte('_')
-	if subset != "" {
-		buf.WriteString(subset)
-		buf.WriteByte('_')
-	}
 	buf.WriteString(pstr)
 
 	return buf.String()
 }
 
+func ComposeServiceNameWithRule(namespace, name string, rule string) string {
+	// FIXME Use sync.Pool to reuse this buffer if the upstream
+	// name composing code path is hot.
+	var p []byte
+	plen := len(namespace) + len(name) + 2
+
+	p = make([]byte, 0, plen)
+	buf := bytes.NewBuffer(p)
+	buf.WriteString(namespace)
+	buf.WriteByte('_')
+	buf.WriteString(name)
+	buf.WriteByte('_')
+	buf.WriteString(rule)
+
+	return buf.String()
+}
+
 // ComposeExternalUpstreamName uses ApisixUpstream namespace, name to compose the upstream name.
 func ComposeExternalUpstreamName(namespace, name string) string {
 	return namespace + "_" + name

cmd/root/root.go

@@ -18,6 +18,7 @@ package root
 
 import (
 	"fmt"
+	"os"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
@@ -26,16 +27,17 @@ import (
 	"gopkg.in/yaml.v2"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-
+	"github.com/go-logr/zapr"
 	"github.com/spf13/cobra"
+	"go.uber.org/zap"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	// +kubebuilder:scaffold:imports
 
 	"github.com/api7/api7-ingress-controller/internal/controller/config"
 	"github.com/api7/api7-ingress-controller/internal/manager"
 	"github.com/api7/api7-ingress-controller/internal/version"
+	"github.com/api7/gopkg/pkg/log"
 )
 
 type ControlPlanesFlag struct {
@@ -115,13 +117,27 @@ func newAPI7IngressController() *cobra.Command {
 				return err
 			}
 
-			logger := zap.New(zap.UseFlagOptions(&zap.Options{
-				Development: true,
-				Level:       logLevel,
-			}))
+			// dashboard sdk log
+			l, err := log.NewLogger(
+				log.WithOutputFile("stderr"),
+				log.WithLogLevel(cfg.LogLevel),
+				log.WithSkipFrames(3),
+			)
+			if err != nil {
+				return err
+			}
+			log.DefaultLogger = l
+
+			// controllers log
+			core := zapcore.NewCore(
+				zapcore.NewConsoleEncoder(zap.NewDevelopmentEncoderConfig()),
+				zapcore.AddSync(zapcore.Lock(os.Stderr)),
+				logLevel,
+			)
+			logger := zapr.NewLogger(zap.New(core, zap.AddCaller()))
 
 			logger.Info("controller start configuration", "config", cfg)
-			ctrl.SetLogger(logger)
+			ctrl.SetLogger(logger.WithName("controller-runtime"))
 
 			ctx := ctrl.LoggerInto(cmd.Context(), logger)
 			return manager.Run(ctx, logger)

config/rbac/role.yaml

@@ -11,6 +11,14 @@ rules:
   verbs:
   - create
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - coordination.k8s.io
   resources:
@@ -23,6 +31,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - gateway.apisix.io.github.com
   resources:
@@ -81,3 +97,18 @@ rules:
   verbs:
   - get
   - update
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes/status
+  verbs:
+  - get
+  - update

internal/controller/config/config.go

@@ -94,8 +94,10 @@ func (c *Config) validateControlPlanes(cpc []*ControlPlaneConfig) error {
 		if len(cp.AdminAPI.Endpoints) == 0 {
 			return fmt.Errorf("control_planes[].admin_api.endpoints is required")
 		}
-		cp.AdminAPI.TLSVerify = new(bool)
-		*cp.AdminAPI.TLSVerify = true
+		if cp.AdminAPI.TLSVerify == nil {
+			cp.AdminAPI.TLSVerify = new(bool)
+			*cp.AdminAPI.TLSVerify = true
+		}
 	}
 	return nil
 }

internal/controller/gateway_controller.go

@@ -14,7 +14,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	gatewayapi "sigs.k8s.io/gateway-api/apis/v1"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gateways,verbs=get;list;watch;update
@@ -31,7 +31,7 @@ type GatewayReconciler struct { //nolint:revive
 // SetupWithManager sets up the controller with the Manager.
 func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&gatewayapi.Gateway{},
+		For(&gatewayv1.Gateway{},
 			builder.WithPredicates(
 				predicate.And(
 					predicate.NewPredicateFuncs(r.matchesGatewayForControlPlaneConfig),
@@ -40,7 +40,7 @@ func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			),
 		).
 		Watches(
-			&gatewayapi.GatewayClass{},
+			&gatewayv1.GatewayClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewayForGatewayClass),
 			builder.WithPredicates(predicate.NewPredicateFuncs(r.matchesGatewayClass)),
 		).
@@ -50,31 +50,31 @@ func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 }
 
 func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	var gateway gatewayapi.Gateway
-	if err := r.Get(ctx, req.NamespacedName, &gateway); err != nil {
+	gateway := new(gatewayv1.Gateway)
+	if err := r.Get(ctx, req.NamespacedName, gateway); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	condition := meta.Condition{
-		Type:               string(gatewayapi.GatewayConditionAccepted),
+		Type:               string(gatewayv1.GatewayConditionAccepted),
 		Status:             meta.ConditionTrue,
-		Reason:             string(gatewayapi.GatewayReasonAccepted),
+		Reason:             string(gatewayv1.GatewayReasonAccepted),
 		ObservedGeneration: gateway.Generation,
 		Message:            acceptedMessage("gateway"),
 		LastTransitionTime: meta.Now(),
 	}
 	if !IsConditionPresentAndEqual(gateway.Status.Conditions, condition) {
 		r.Log.Info("gateway has been accepted", "gateway", gateway.Name)
-		setGatewayCondition(&gateway, condition)
-		if err := r.Status().Update(ctx, &gateway); err != nil {
+		setGatewayCondition(gateway, condition)
+		if err := r.Status().Update(ctx, gateway); err != nil {
 			return ctrl.Result{}, err
 		}
 	}
 	return ctrl.Result{}, nil
 }
 
 func (r *GatewayReconciler) matchesGatewayClass(obj client.Object) bool {
-	gateway, ok := obj.(*gatewayapi.GatewayClass)
+	gateway, ok := obj.(*gatewayv1.GatewayClass)
 	if !ok {
 		r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to Gateway")
 		return false
@@ -83,7 +83,7 @@ func (r *GatewayReconciler) matchesGatewayClass(obj client.Object) bool {
 }
 
 func (r *GatewayReconciler) matchesGatewayForControlPlaneConfig(obj client.Object) bool {
-	gateway, ok := obj.(*gatewayapi.Gateway)
+	gateway, ok := obj.(*gatewayv1.Gateway)
 	if !ok {
 		r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to Gateway")
 		return false
@@ -97,15 +97,15 @@ func (r *GatewayReconciler) matchesGatewayForControlPlaneConfig(obj client.Objec
 }
 
 func (r *GatewayReconciler) listGatewayForGatewayClass(ctx context.Context, gatewayClass client.Object) []reconcile.Request {
-	gatewayList := &gatewayapi.GatewayList{}
+	gatewayList := &gatewayv1.GatewayList{}
 	if err := r.List(context.Background(), gatewayList); err != nil {
 		r.Log.Error(err, "failed to list gateways for gateway class",
 			"gatewayclass", gatewayClass.GetName(),
 		)
 		return nil
 	}
 
-	gateways := []gatewayapi.Gateway{}
+	gateways := []gatewayv1.Gateway{}
 	for _, gateway := range gatewayList.Items {
 		if cp := config.GetControlPlaneConfigByGatewatName(gateway.GetName()); cp != nil {
 			gateways = append(gateways, gateway)
@@ -115,13 +115,13 @@ func (r *GatewayReconciler) listGatewayForGatewayClass(ctx context.Context, gate
 }
 
 func (r *GatewayReconciler) checkGatewayClass(obj client.Object) bool {
-	gateway, ok := obj.(*gatewayapi.Gateway)
+	gateway, ok := obj.(*gatewayv1.Gateway)
 	if !ok {
 		r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to Gateway")
 		return false
 	}
 
-	gatewayClass := &gatewayapi.GatewayClass{}
+	gatewayClass := &gatewayv1.GatewayClass{}
 	if err := r.Client.Get(context.Background(), client.ObjectKey{Name: string(gateway.Spec.GatewayClassName)}, gatewayClass); err != nil {
 		r.Log.Error(err, "failed to get gateway class", "gatewayclass", gateway.Spec.GatewayClassName)
 		return false

internal/controller/gatewayclass_congroller.go

@@ -11,7 +11,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
-	gatewayapi "sigs.k8s.io/gateway-api/apis/v1"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 )
 
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gatewayclasses,verbs=get;list;watch;update
@@ -28,39 +28,39 @@ type GatewayClassReconciler struct { //nolint:revive
 // SetupWithManager sets up the controller with the Manager.
 func (r *GatewayClassReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&gatewayapi.GatewayClass{}).
+		For(&gatewayv1.GatewayClass{}).
 		WithEventFilter(predicate.NewPredicateFuncs(r.GatewayClassFilter)).
 		WithEventFilter(predicate.GenerationChangedPredicate{}).
 		Complete(r)
 }
 
 func (r *GatewayClassReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	var gc gatewayapi.GatewayClass
-	if err := r.Get(ctx, req.NamespacedName, &gc); err != nil {
+	gc := new(gatewayv1.GatewayClass)
+	if err := r.Get(ctx, req.NamespacedName, gc); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	condition := meta.Condition{
-		Type:               string(gatewayapi.GatewayClassConditionStatusAccepted),
+		Type:               string(gatewayv1.GatewayClassConditionStatusAccepted),
 		Status:             meta.ConditionTrue,
-		Reason:             string(gatewayapi.GatewayClassReasonAccepted),
+		Reason:             string(gatewayv1.GatewayClassReasonAccepted),
 		ObservedGeneration: gc.Generation,
 		Message:            "the gatewayclass has been accepted by the api7-ingress-controller",
 		LastTransitionTime: meta.Now(),
 	}
 
 	if !IsConditionPresentAndEqual(gc.Status.Conditions, condition) {
 		r.Log.Info("gatewayclass has been accepted", "gatewayclass", gc.Name)
-		setGatewayClassCondition(&gc, condition)
-		if err := r.Status().Update(ctx, &gc); err != nil {
+		setGatewayClassCondition(gc, condition)
+		if err := r.Status().Update(ctx, gc); err != nil {
 			return ctrl.Result{}, err
 		}
 	}
 	return ctrl.Result{}, nil
 }
 
 func (r *GatewayClassReconciler) GatewayClassFilter(obj client.Object) bool {
-	gatewayClass, ok := obj.(*gatewayapi.GatewayClass)
+	gatewayClass, ok := obj.(*gatewayv1.GatewayClass)
 	if !ok {
 		r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to GatewayClass")
 		return false
@@ -73,7 +73,7 @@ func matchesController(controllerName string) bool {
 	return controllerName == config.ControllerConfig.ControllerName
 }
 
-func setGatewayClassCondition(gwc *gatewayapi.GatewayClass, newCondition meta.Condition) {
+func setGatewayClassCondition(gwc *gatewayv1.GatewayClass, newCondition meta.Condition) {
 	newConditions := []meta.Condition{}
 	for _, condition := range gwc.Status.Conditions {
 		if condition.Type != newCondition.Type {