feat: support global rules (#62)

Signed-off-by: ashing <[email protected]>

Author: ronething

.dockerignore

@@ -21,23 +21,12 @@ RUN apt update \
     && mv ./node-binary/linux-${TARGETARCH} /bin/adc \
     && rm -rf /app
 
-FROM golang:1.22 AS builder
-WORKDIR /workspace
-COPY go.* ./
-
-RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.cn,direct ; fi \
-    && go mod download
-
-COPY . .
-
-RUN --mount=type=cache,target=/root/.cache/go-build make build && mv bin/api7-ingress-controller /bin && rm -rf /workspace
-
 FROM debian:bullseye-slim
 WORKDIR /app
 
-COPY --from=builder /bin/api7-ingress-controller .
 COPY --from=node_builder /bin/adc /bin/adc
-COPY config/samples/config.yaml ./conf/config.yaml
+COPY ./bin/api7-ingress-controller .
+COPY ./config/samples/config.yaml ./conf/config.yaml
 
 ENTRYPOINT ["/app/api7-ingress-controller"]
 CMD ["-c", "/app/conf/config.yaml"]

Dockerfile.dev

@@ -127,6 +127,10 @@ kind-load-images: pull-infra-images
 	@kind load docker-image $(IMG) --name $(KIND_NAME)
 	@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
 
+.PHONY: kind-load-ingress-image
+kind-load-ingress-image:
+	@kind load docker-image $(IMG) --name $(KIND_NAME)
+
 .PHONY: pull-infra-images
 pull-infra-images:
 	@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
@@ -146,6 +150,8 @@ kind-load-image:
 build: manifests generate fmt vet ## Build manager binary.
 	CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
 
+linux-build:
+	GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -o bin/api7-ingress-controller -ldflags $(GO_LDFLAGS) cmd/main.go
 
 .PHONY: build-image
 build-image: docker-build
@@ -158,7 +164,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
-docker-build: ## Build docker image with the manager.
+docker-build: build ## Build docker image with the manager.
 	$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile.dev .
 
 .PHONY: docker-push

Makefile

@@ -55,6 +55,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - gateway.apisix.io
+  resources:
+  - gatewayproxies
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - gateway.apisix.io
   resources:

config/rbac/role.yaml

@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/api7/api7-ingress-controller/api/v1alpha1"
 	"github.com/api7/api7-ingress-controller/internal/controller/config"
+	"github.com/api7/api7-ingress-controller/internal/controller/indexer"
 	"github.com/api7/api7-ingress-controller/internal/provider"
 	"github.com/api7/gopkg/pkg/log"
 	"github.com/go-logr/logr"
@@ -33,10 +35,26 @@ type GatewayReconciler struct { //nolint:revive
 	Provider provider.Provider
 }
 
+func (r *GatewayReconciler) setupIndexer(mgr ctrl.Manager) error {
+	if err := mgr.GetFieldIndexer().IndexField(
+		context.Background(),
+		&gatewayv1.Gateway{},
+		indexer.ParametersRef,
+		indexer.GatewayParametersRefIndexFunc,
+	); err != nil {
+		return err
+	}
+	return nil
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	if err := r.setupIndexer(mgr); err != nil {
+		return err
+	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&gatewayv1.Gateway{}).
+		WithEventFilter(predicate.GenerationChangedPredicate{}).
 		Watches(
 			&gatewayv1.GatewayClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewayForGatewayClass),
@@ -46,6 +64,10 @@ func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			&gatewayv1.HTTPRoute{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewaysForHTTPRoute),
 		).
+		Watches(
+			&v1alpha1.GatewayProxy{},
+			handler.EnqueueRequestsFromMapFunc(r.listGatewaysForGatewayProxy),
+		).
 		Complete(r)
 }
 
@@ -99,6 +121,13 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		Secrets: make(map[types.NamespacedName]*corev1.Secret),
 	}
 	r.processListenerConfig(tctx, gateway, ns)
+	if err := r.processInfrastructure(tctx, gateway, ns); err != nil {
+		acceptStatus = status{
+			status: false,
+			msg:    err.Error(),
+		}
+	}
+
 	if err := r.Provider.Update(ctx, tctx, gateway); err != nil {
 		acceptStatus = status{
 			status: false,
@@ -108,6 +137,7 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	ListenerStatuses, err := getListenerStatus(ctx, r.Client, gateway)
 	if err != nil {
+		log.Error(err, "failed to get listener status", "gateway", gateway.GetName())
 		return ctrl.Result{}, err
 	}
 
@@ -123,6 +153,7 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 		return ctrl.Result{}, r.Status().Update(ctx, gateway)
 	}
+
 	return ctrl.Result{}, nil
 }
 
@@ -181,6 +212,35 @@ func (r *GatewayReconciler) checkGatewayClass(gateway *gatewayv1.Gateway) bool {
 	return matchesController(string(gatewayClass.Spec.ControllerName))
 }
 
+func (r *GatewayReconciler) listGatewaysForGatewayProxy(ctx context.Context, obj client.Object) []reconcile.Request {
+	gatewayProxy, ok := obj.(*v1alpha1.GatewayProxy)
+	if !ok {
+		r.Log.Error(fmt.Errorf("unexpected object type"), "failed to convert object to GatewayProxy")
+		return nil
+	}
+	namespace := gatewayProxy.GetNamespace()
+	name := gatewayProxy.GetName()
+
+	gatewayList := &gatewayv1.GatewayList{}
+	if err := r.List(ctx, gatewayList, client.MatchingFields{
+		indexer.ParametersRef: indexer.GenIndexKey(namespace, name),
+	}); err != nil {
+		r.Log.Error(err, "failed to list gateways for gateway proxy", "gatewayproxy", gatewayProxy.GetName())
+		return nil
+	}
+
+	recs := make([]reconcile.Request, 0, len(gatewayList.Items))
+	for _, gateway := range gatewayList.Items {
+		recs = append(recs, reconcile.Request{
+			NamespacedName: client.ObjectKey{
+				Namespace: gateway.GetNamespace(),
+				Name:      gateway.GetName(),
+			},
+		})
+	}
+	return recs
+}
+
 func (r *GatewayReconciler) listGatewaysForHTTPRoute(_ context.Context, obj client.Object) []reconcile.Request {
 	httpRoute, ok := obj.(*gatewayv1.HTTPRoute)
 	if !ok {
@@ -215,6 +275,30 @@ func (r *GatewayReconciler) listGatewaysForHTTPRoute(_ context.Context, obj clie
 	return recs
 }
 
+func (r *GatewayReconciler) processInfrastructure(tctx *provider.TranslateContext, gateway *gatewayv1.Gateway, ns string) error {
+	infra := gateway.Spec.Infrastructure
+	if infra == nil || infra.ParametersRef == nil {
+		return nil
+	}
+
+	paramRef := infra.ParametersRef
+	if string(paramRef.Group) == v1alpha1.GroupVersion.Group && string(paramRef.Kind) == "GatewayProxy" {
+		gatewayProxy := &v1alpha1.GatewayProxy{}
+		if err := r.Get(context.Background(), client.ObjectKey{
+			Namespace: ns,
+			Name:      paramRef.Name,
+		}, gatewayProxy); err != nil {
+			log.Error(err, "failed to get GatewayProxy", "namespace", ns, "name", paramRef.Name)
+			return err
+		} else {
+			log.Info("found GatewayProxy for Gateway", "gateway", gateway.Name, "gatewayproxy", gatewayProxy.Name)
+			tctx.GatewayProxy = gatewayProxy
+		}
+	}
+
+	return nil
+}
+
 func (r *GatewayReconciler) processListenerConfig(tctx *provider.TranslateContext, gateway *gatewayv1.Gateway, ns string) {
 	listeners := gateway.Spec.Listeners
 	for _, listener := range listeners {

internal/controller/gateway_controller.go

@@ -14,6 +14,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
@@ -42,6 +43,7 @@ func (r *HTTPRouteReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&gatewayv1.HTTPRoute{}).
+		WithEventFilter(predicate.GenerationChangedPredicate{}).
 		Watches(&discoveryv1.EndpointSlice{},
 			handler.EnqueueRequestsFromMapFunc(r.listHTTPRoutesByServiceBef),
 		).
@@ -96,6 +98,7 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	}
 
 	tctx := provider.NewDefaultTranslateContext()
+
 	if err := r.processHTTPRoute(tctx, hr); err != nil {
 		acceptStatus.status = false
 		acceptStatus.msg = err.Error()
@@ -113,8 +116,6 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		acceptStatus.msg = err.Error()
 	}
 
-	// process the HTTPRoute
-
 	// TODO: diff the old and new status
 	hr.Status.Parents = make([]gatewayv1.RouteParentStatus, 0, len(gateways))
 	for _, gateway := range gateways {
@@ -139,15 +140,15 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 // SetupWithManager sets up the controller with the Manager.
 func (r *HTTPRouteReconciler) setupIndexer(mgr ctrl.Manager) error {
 	if err := mgr.GetFieldIndexer().IndexField(
-		context.TODO(),
+		context.Background(),
 		&gatewayv1.HTTPRoute{},
 		indexer.ExtensionRef,
 		indexer.HTTPRouteExtensionIndexFunc,
 	); err != nil {
 		return err
 	}
 	if err := mgr.GetFieldIndexer().IndexField(
-		context.TODO(),
+		context.Background(),
 		&gatewayv1.HTTPRoute{},
 		indexer.ServiceIndexRef,
 		indexer.HTTPRouteServiceIndexFunc,

internal/controller/httproute_controller.go

@@ -8,6 +8,7 @@ import (
 const (
 	ServiceIndexRef = "serviceRef"
 	ExtensionRef    = "extensionRef"
+	ParametersRef   = "parametersRef"
 )
 
 func GenIndexKey(namespace, name string) string {
@@ -50,3 +51,15 @@ func HTTPRouteExtensionIndexFunc(rawObj client.Object) []string {
 	}
 	return keys
 }
+
+func GatewayParametersRefIndexFunc(rawObj client.Object) []string {
+	gw := rawObj.(*gatewayv1.Gateway)
+	if gw.Spec.Infrastructure != nil && gw.Spec.Infrastructure.ParametersRef != nil {
+		// now we only care about kind: GatewayProxy
+		if gw.Spec.Infrastructure.ParametersRef.Kind == "GatewayProxy" {
+			name := gw.Spec.Infrastructure.ParametersRef.Name
+			return []string{GenIndexKey(gw.GetNamespace(), name)}
+		}
+	}
+	return nil
+}

internal/controller/indexer/indexer.go

@@ -17,6 +17,7 @@ import (
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
 // +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch
 // +kubebuilder:rbac:groups=gateway.apisix.io,resources=pluginconfigs,verbs=get;list;watch
+// +kubebuilder:rbac:groups=gateway.apisix.io,resources=gatewayproxies,verbs=get;list;watch
 
 type Controller interface {
 	SetupWithManager(mgr manager.Manager) error