Fixed pixiu proxy request 502 (#864)

Author: mfordjody

.asf.yaml

@@ -20,7 +20,7 @@ notifications:
     jira_options: link label
 
 github:
-  homepage: https://dubbo.apache.org
+  homepage: ""
   description: "Dubbo Service Mesh for Kubernetes."
   features:
     # Enable wiki for documentation

dubbod/discovery/docker/dockerfile.discovery

@@ -13,7 +13,29 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/distroless/static:debug
-COPY bin/dubbo-discovery /usr/local/bin/dubbo-discovery
-USER 9999:9999
+FROM golang:1.25 AS builder
+
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /src
+
+ENV CGO_ENABLED=0 \
+    GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH}
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+
+RUN go build -v -trimpath -ldflags="-s -w" \
+    -o /out/dubbo-discovery \
+    ./dubbod/discovery/cmd/dubbo-discover/main.go
+
+FROM scratch
+
+COPY --from=builder /out/dubbo-discovery /usr/local/bin/dubbo-discovery
+
+USER 65532:65532
 ENTRYPOINT ["/usr/local/bin/dubbo-discovery"]

dubbod/discovery/docker/dockerfile.proxy

@@ -13,8 +13,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/distroless/static:debug
-COPY bin/dubbo-agent /usr/local/bin/dubbo-agent
-COPY bin/pixiu-gateway /usr/local/bin/pixiu-gateway
-USER 9999:9999
-ENTRYPOINT ["/usr/local/bin/dubbo-agent"]
+FROM golang:1.25 AS builder
+
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /src
+
+ENV CGO_ENABLED=0 \
+    GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH}
+
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+
+RUN go build -v -trimpath -ldflags="-s -w" \
+    -o /out/dubbo-agent \
+    ./dubbod/discovery/cmd/dubbo-agent/main.go
+
+RUN git clone --depth=1 https://github.com/apache/dubbo-go-pixiu.git && \
+    cd dubbo-go-pixiu && \
+    go build -v -trimpath -ldflags="-s -w" \
+    -o /out/pixiu-proxy \
+    ./cmd/pixiu/pixiu.go
+
+FROM scratch
+
+COPY --from=builder /out/dubbo-agent /usr/local/bin/dubbo-agent
+COPY --from=builder /out/pixiu-proxy /usr/local/bin/pixiu-proxy
+
+USER 65532:65532
+ENTRYPOINT ["/usr/local/bin/dubbo-agent"]

dubbod/discovery/pkg/config/kube/gateway/controller.go

@@ -62,7 +62,9 @@ type Controller struct {
 	inputs         Inputs
 }
 
-type Outputs struct{}
+type Outputs struct {
+	Gateways krt.Collection[Gateway]
+}
 
 type Inputs struct {
 	Services   krt.Collection[*corev1.Service]
@@ -99,11 +101,23 @@ func NewController(kc kube.Client, waitForCRD func(class schema.GroupVersionReso
 		HTTPRoutes:     buildClient[*gateway.HTTPRoute](c, kc, gvr.HTTPRoute, opts, "informer/HTTPRoutes"),
 	}
 
-	GatewayClassStatus, _ := GatewayClassesCollection(inputs.GatewayClasses, opts)
+	GatewayClassStatus, GatewayClasses := GatewayClassesCollection(inputs.GatewayClasses, opts)
 	status.RegisterStatus(c.status, GatewayClassStatus, GetStatus)
 
+	GatewaysStatus, Gateways := GatewaysCollection(
+		inputs.Gateways,
+		GatewayClasses,
+		opts,
+	)
+
+	GatewayFinalStatus := FinalGatewayStatusCollection(GatewaysStatus, opts)
+	status.RegisterStatus(c.status, GatewayFinalStatus, GetStatus)
+
 	handlers := []krt.HandlerRegistration{}
-	outputs := Outputs{}
+	outputs := Outputs{
+		Gateways: Gateways,
+	}
+
 	c.outputs = outputs
 	c.handlers = handlers
 	c.inputs = inputs

dubbod/discovery/pkg/config/kube/gateway/deployment_controller.go

@@ -727,7 +727,6 @@ func (d *DeploymentController) generatePixiuConfig(gw *gateway.Gateway, httpRout
 						Name: "dgp.filter.httpconnectionmanager",
 						Config: map[string]interface{}{
 							"route_config": map[string]interface{}{
-								"name":   fmt.Sprintf("route-%s", listener.Name),
 								"routes": d.convertHTTPRoutesToPixiuRoutes(httpRoutes, listener),
 							},
 							"http_filters": []map[string]interface{}{
@@ -759,6 +758,24 @@ func (d *DeploymentController) generatePixiuConfig(gw *gateway.Gateway, httpRout
 					backendPort = int(*backendRef.Port)
 				}
 
+				// Prefer Service ClusterIP to avoid DNS dependency inside the gateway pod.
+				backendAddr := fmt.Sprintf("%s.%s.svc.cluster.local", backendName, backendNamespace)
+				if d.services != nil {
+					if svc := d.services.Get(backendName, backendNamespace); svc != nil {
+						if ip := svc.Spec.ClusterIP; ip != "" && ip != corev1.ClusterIPNone {
+							backendAddr = ip
+						}
+					}
+				}
+				// Fallback: if informer filtering prevented us from seeing the Service, read it directly.
+				if backendAddr == fmt.Sprintf("%s.%s.svc.cluster.local", backendName, backendNamespace) && d.client != nil {
+					if svc, err := d.client.Kube().CoreV1().Services(backendNamespace).Get(context.Background(), backendName, metav1.GetOptions{}); err == nil {
+						if ip := svc.Spec.ClusterIP; ip != "" && ip != corev1.ClusterIPNone {
+							backendAddr = ip
+						}
+					}
+				}
+
 				clusterName := fmt.Sprintf("%s-%s-%d", backendNamespace, backendName, backendPort)
 				if _, exists := clusterMap[clusterName]; !exists {
 					clusterMap[clusterName] = &PixiuCluster{
@@ -769,7 +786,7 @@ func (d *DeploymentController) generatePixiuConfig(gw *gateway.Gateway, httpRout
 							{
 								ID: 1,
 								SocketAddress: PixiuSocketAddress{
-									Address: fmt.Sprintf("%s.%s.svc.cluster.local", backendName, backendNamespace),
+									Address: backendAddr,
 									Port:    backendPort,
 								},
 							},
@@ -844,6 +861,11 @@ func (d *DeploymentController) convertHTTPRoutesToPixiuRoutes(httpRoutes []*gate
 							pathMatch["regex"] = match.Path.Value
 						}
 					}
+
+					if match.Method == nil {
+						pathMatch["methods"] = []string{}
+					}
+
 					route["match"] = pathMatch
 				}
 

dubbod/discovery/pkg/config/kube/gateway/gateway_collection.go

@@ -39,10 +39,7 @@ func getKnownControllerNames() []string {
 	return names
 }
 
-func GatewayClassesCollection(
-	gatewayClasses krt.Collection[*gateway.GatewayClass],
-	opts krt.OptionsBuilder,
-) (
+func GatewayClassesCollection(gatewayClasses krt.Collection[*gateway.GatewayClass], opts krt.OptionsBuilder) (
 	krt.StatusCollection[*gateway.GatewayClass, gatewayv1.GatewayClassStatus],
 	krt.Collection[GatewayClass],
 ) {
@@ -67,3 +64,19 @@ func GatewayClassesCollection(
 		}
 	}, opts.WithName("GatewayClasses")...)
 }
+
+func fetchClass(ctx krt.HandlerContext, gatewayClasses krt.Collection[GatewayClass], gc gatewayv1.ObjectName) *GatewayClass {
+	class := krt.FetchOne(ctx, gatewayClasses, krt.FilterKey(string(gc)))
+	if class == nil {
+		if bc, f := builtinClasses[gc]; f {
+			// We allow some classes to exist without being in the cluster
+			return &GatewayClass{
+				Name:       string(gc),
+				Controller: bc,
+			}
+		}
+		// No gateway class found, this may be meant for another controller; should be skipped.
+		return nil
+	}
+	return class
+}

dubbod/discovery/pkg/config/kube/gateway/gatewayclass_collection.go

@@ -0,0 +1,117 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package gateway
+
+import (
+	"github.com/apache/dubbo-kubernetes/pkg/config"
+	"github.com/apache/dubbo-kubernetes/pkg/kube/krt"
+	"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model/kstatus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	gateway "sigs.k8s.io/gateway-api/apis/v1"
+)
+
+type Gateway struct {
+	*config.Config `json:"config"`
+}
+
+func (g Gateway) ResourceName() string {
+	return config.NamespacedName(g.Config).String()
+}
+
+func GatewaysCollection(
+	gateways krt.Collection[*gateway.Gateway],
+	gatewayClasses krt.Collection[GatewayClass],
+	opts krt.OptionsBuilder,
+) (
+	krt.StatusCollection[*gateway.Gateway, gateway.GatewayStatus],
+	krt.Collection[Gateway],
+) {
+	statusCol, gw := krt.NewStatusManyCollection(gateways, func(ctx krt.HandlerContext, obj *gateway.Gateway) (*gateway.GatewayStatus, []Gateway) {
+		result := []Gateway{}
+		kgw := obj.Spec
+		status := obj.Status.DeepCopy()
+		class := fetchClass(ctx, gatewayClasses, kgw.GatewayClassName)
+		if class == nil {
+			return nil, nil
+		}
+		controllerName := class.Controller
+		classInfo, f := classInfos[controllerName]
+		if !f {
+			return nil, nil
+		}
+		if classInfo.disableRouteGeneration {
+			// For now we still mark the Gateway as accepted, but let higher layers control route generation.
+			status = setGatewayConditions(status, obj.Generation, true, true)
+			return status, result
+		}
+
+		// Default behavior: GatewayClass is known and managed by this controller.
+		// Mark Accepted/Programmed to ensure status no longer stays at "Waiting for controller".
+		status = setGatewayConditions(status, obj.Generation, true, true)
+		return status, result
+	}, opts.WithName("KubernetesGateway")...)
+
+	return statusCol, gw
+}
+
+func setGatewayConditions(
+	existing *gateway.GatewayStatus,
+	gen int64,
+	accepted, programmed bool,
+) *gateway.GatewayStatus {
+	boolToConditionStatus := func(b bool) metav1.ConditionStatus {
+		if b {
+			return metav1.ConditionTrue
+		}
+		return metav1.ConditionFalse
+	}
+
+	msg := "Handled by Dubbo controller"
+	conds := kstatus.UpdateConditionIfChanged(existing.Conditions, metav1.Condition{
+		Type:               string(gateway.GatewayConditionAccepted),
+		Status:             boolToConditionStatus(accepted),
+		ObservedGeneration: gen,
+		LastTransitionTime: metav1.Now(),
+		Reason:             "Accepted",
+		Message:            msg,
+	})
+	conds = kstatus.UpdateConditionIfChanged(conds, metav1.Condition{
+		Type:               string(gateway.GatewayConditionProgrammed),
+		Status:             boolToConditionStatus(programmed),
+		ObservedGeneration: gen,
+		LastTransitionTime: metav1.Now(),
+		Reason:             "Programmed",
+		Message:            msg,
+	})
+	existing.Conditions = conds
+	return existing
+}
+
+func FinalGatewayStatusCollection(
+	gatewayStatuses krt.StatusCollection[*gateway.Gateway, gateway.GatewayStatus],
+	opts krt.OptionsBuilder,
+) krt.StatusCollection[*gateway.Gateway, gateway.GatewayStatus] {
+	return krt.NewCollection(
+		gatewayStatuses,
+		func(ctx krt.HandlerContext, i krt.ObjectWithStatus[*gateway.Gateway, gateway.GatewayStatus]) *krt.ObjectWithStatus[*gateway.Gateway, gateway.GatewayStatus] {
+			status := i.Status.DeepCopy()
+			return &krt.ObjectWithStatus[*gateway.Gateway, gateway.GatewayStatus]{
+				Obj:    i.Obj,
+				Status: *status,
+			}
+		}, opts.WithName("GatewayFinalStatus")...)
+}

dubbod/discovery/pkg/config/kube/gateway/gateways_collection.go

@@ -15,7 +15,7 @@
 
 module github.com/apache/dubbo-kubernetes
 
-go 1.24.0
+go 1.25.0
 
 require (
 	k8s.io/apimachinery v0.34.1

go.mod

@@ -46,7 +46,7 @@ spec:
       serviceAccountName: {{ .ServiceAccount }}
       containers:
       - name: dubbo-proxy
-        image: mfordjody/dubbo-proxy:0.3.5
+        image: dubboregistry/dubbo-proxy:0.3.5
         imagePullPolicy: Always
         ports:
         - containerPort: 15020