fix: r

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

Makefile

@@ -54,6 +54,7 @@ func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&gatewayv1.Gateway{}).
+		WithEventFilter(predicate.GenerationChangedPredicate{}).
 		Watches(
 			&gatewayv1.GatewayClass{},
 			handler.EnqueueRequestsFromMapFunc(r.listGatewayForGatewayClass),
@@ -136,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
 	}
 
@@ -151,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
 }
 

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 {

internal/controller/httproute_controller.go

@@ -46,15 +46,26 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 	var result *translator.TranslateResult
 	var err error
 
+	var task Task = Task{
+		Name:   obj.GetName(),
+		Labels: label.GenLabel(obj),
+	}
+	var extraArgs []string
+
 	switch obj := obj.(type) {
 	case *gatewayv1.HTTPRoute:
+		extraArgs = append(extraArgs, "--include-resource-type", "service")
+		log.Debugw("translating http route", zap.Any("http route", obj))
 		result, err = d.translator.TranslateHTTPRoute(tctx, obj.DeepCopy())
 	case *gatewayv1.Gateway:
+		extraArgs = append(extraArgs, "--include-resource-type", "global_rule")
+		log.Debugw("translating gateway", zap.Any("gateway", obj))
 		result, err = d.translator.TranslateGateway(tctx, obj.DeepCopy())
 	}
 	if err != nil {
 		return err
 	}
+	log.Debugw("translated result", zap.Any("result", result))
 	if result == nil {
 		return nil
 	}
@@ -63,22 +74,32 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 		Services:    result.Services,
 		GlobalRules: result.GlobalRules,
 	}
+	log.Debugw("adc resources", zap.Any("resources", resources))
 
-	return d.sync(Task{
-		Name:      obj.GetName(),
-		Resources: resources,
-		Labels:    label.GenLabel(obj),
-	})
+	task.Resources = resources
+
+	return d.sync(task, extraArgs...)
 }
 
 func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
-	return d.sync(Task{
+	task := Task{
 		Name:   obj.GetName(),
 		Labels: label.GenLabel(obj),
-	})
+	}
+
+	var extraArgs []string
+
+	switch obj.(type) {
+	case *gatewayv1.HTTPRoute:
+		extraArgs = append(extraArgs, "--include-resource-type", "service")
+	case *gatewayv1.Gateway:
+		extraArgs = append(extraArgs, "--include-resource-type", "global_rule")
+	}
+
+	return d.sync(task, extraArgs...)
 }
 
-func (d *adcClient) sync(task Task) error {
+func (d *adcClient) sync(task Task, extraArgs ...string) error {
 	log.Debugw("syncing task", zap.Any("task", task))
 
 	yaml, err := yaml.Marshal(task.Resources)
@@ -103,11 +124,13 @@ func (d *adcClient) sync(task Task) error {
 	args := []string{
 		"sync",
 		"-f", tmpFile.Name(),
-		"--include-resource-type", "service",
-		"--include-resource-type", "global_rule",
 		"--tls-skip-verify",
 	}
 
+	if len(extraArgs) > 0 {
+		args = append(args, extraArgs...)
+	}
+
 	for k, v := range task.Labels {
 		args = append(args, "--label-selector", k+"="+v)
 	}
@@ -132,5 +155,8 @@ func (d *adcClient) sync(task Task) error {
 		)
 		return err
 	}
+
+	log.Debugw("adc sync success", zap.String("taskname", task.Name))
+
 	return nil
 }

internal/provider/adc/adc.go

@@ -10,7 +10,7 @@ import (
 	"github.com/api7/api7-ingress-controller/test/e2e/scaffold"
 )
 
-var _ = FDescribe("Test GatewayProxy", func() {
+var _ = Describe("Test GatewayProxy", func() {
 	s := scaffold.NewDefaultScaffold()
 
 	var defaultGatewayClass = `
@@ -157,7 +157,6 @@ spec:
 	AfterEach(func() {
 		By("Clean up resources")
 		_ = s.DeleteResourceFromString(gatewayProxyWithEnabledPlugin)
-		_ = s.DeleteResourceFromString(gatewayProxyWithDisabledPlugin)
 		_ = s.DeleteResourceFromString(fmt.Sprintf(httpRouteForTest, "api7"))
 		_ = s.DeleteResourceFromString(fmt.Sprintf(gatewayWithProxy, gatewayClassName))
 	})