@@ -30,9 +30,9 @@ import (
3030 "github.com/apache/dubbo-kubernetes/pkg/util/sets"
3131 "github.com/apache/dubbo-kubernetes/pkg/wellknown"
3232 core "github.com/dubbo-kubernetes/xds-api/core/v1"
33- routerv3 "github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/http/router"
34- hcmv3 "github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/network/http_connection_manager"
35- tlsv3 "github.com/dubbo-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
33+ routerv1 "github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/http/router"
34+ hcmv1 "github.com/dubbo-kubernetes/xds-api/extensions/filters/v1/network/http_connection_manager"
35+ tlsv1 "github.com/dubbo-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
3636 listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
3737 route "github.com/dubbo-kubernetes/xds-api/route/v1"
3838 discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
@@ -213,7 +213,7 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
213213 // "missing HttpConnectionManager filter", gRPC proxyless clients require HttpConnectionManager
214214 // in the FilterChain for inbound listeners.
215215 routeName := fmt .Sprintf ("%d" , listenPort )
216- var hcm * hcmv3 .HttpConnectionManager
216+ var hcm * hcmv1 .HttpConnectionManager
217217
218218 // For Gateway Pods (router type), use RDS to get route configuration from HTTPRoute
219219 // This allows Gateway to route external traffic to backend services based on HTTPRoute rules
@@ -223,11 +223,11 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
223223 }
224224 log .Infof (" Gateway Pod (router) using RDS for listener %s, routeName=%s, node.ID=%s, node.Type=%v, service=%s" , name , routeName , node .ID , node .Type , si .Service .Attributes .Name )
225225 // Gateway Pods need RDS to route traffic based on HTTPRoute
226- hcm = & hcmv3 .HttpConnectionManager {
227- CodecType : hcmv3 .HttpConnectionManager_AUTO ,
226+ hcm = & hcmv1 .HttpConnectionManager {
227+ CodecType : hcmv1 .HttpConnectionManager_AUTO ,
228228 StatPrefix : fmt .Sprintf ("inbound_%d" , listenPort ),
229- RouteSpecifier : & hcmv3 .HttpConnectionManager_Rds {
230- Rds : & hcmv3 .Rds {
229+ RouteSpecifier : & hcmv1 .HttpConnectionManager_Rds {
230+ Rds : & hcmv1 .Rds {
231231 ConfigSource : & core.ConfigSource {
232232 ConfigSourceSpecifier : & core.ConfigSource_Ads {
233233 Ads : & core.AggregatedConfigSource {},
@@ -236,11 +236,11 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
236236 RouteConfigName : routeName ,
237237 },
238238 },
239- HttpFilters : []* hcmv3 .HttpFilter {
239+ HttpFilters : []* hcmv1 .HttpFilter {
240240 {
241241 Name : "filters.http.router" ,
242- ConfigType : & hcmv3 .HttpFilter_TypedConfig {
243- TypedConfig : protoconv .MessageToAny (& routerv3 .Router {}),
242+ ConfigType : & hcmv1 .HttpFilter_TypedConfig {
243+ TypedConfig : protoconv .MessageToAny (& routerv1 .Router {}),
244244 },
245245 },
246246 },
@@ -250,10 +250,10 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
250250 // For regular service Pods, use inline RouteConfig with NonForwardingAction
251251 // Use inline RouteConfig instead of RDS to avoid triggering additional RDS requests that cause push loops
252252 // For proxyless gRPC, inline configuration is preferred to minimize round-trips
253- hcm = & hcmv3 .HttpConnectionManager {
254- CodecType : hcmv3 .HttpConnectionManager_AUTO ,
253+ hcm = & hcmv1 .HttpConnectionManager {
254+ CodecType : hcmv1 .HttpConnectionManager_AUTO ,
255255 StatPrefix : fmt .Sprintf ("inbound_%d" , listenPort ),
256- RouteSpecifier : & hcmv3 .HttpConnectionManager_RouteConfig {
256+ RouteSpecifier : & hcmv1 .HttpConnectionManager_RouteConfig {
257257 RouteConfig : & route.RouteConfiguration {
258258 Name : routeName ,
259259 VirtualHosts : []* route.VirtualHost {
@@ -274,11 +274,11 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
274274 },
275275 },
276276 },
277- HttpFilters : []* hcmv3 .HttpFilter {
277+ HttpFilters : []* hcmv1 .HttpFilter {
278278 {
279279 Name : "filters.http.router" ,
280- ConfigType : & hcmv3 .HttpFilter_TypedConfig {
281- TypedConfig : protoconv .MessageToAny (& routerv3 .Router {}),
280+ ConfigType : & hcmv1 .HttpFilter_TypedConfig {
281+ TypedConfig : protoconv .MessageToAny (& routerv1 .Router {}),
282282 },
283283 },
284284 },
@@ -359,7 +359,7 @@ func buildDownstreamTransportSocket(mode model.MutualTLSMode) *core.TransportSoc
359359 // For STRICT mTLS, we require client certificates and validate them
360360 // The validation context is already configured in buildCommonTLSContext
361361 // via the certificate provider instance (ROOTCA)
362- tlsContext := & tlsv3 .DownstreamTlsContext {
362+ tlsContext := & tlsv1 .DownstreamTlsContext {
363363 CommonTlsContext : common ,
364364 RequireClientCertificate : wrapperspb .Bool (true ),
365365 // Note: gRPC proxyless uses certificate provider for validation
@@ -516,11 +516,11 @@ func buildOutboundListeners(node *model.Proxy, push *model.PushContext, filter l
516516 // For gRPC proxyless, outbound listeners MUST use ApiListener with RDS
517517 // This is the correct pattern used by Dubbo for gRPC xDS clients
518518 // Using FilterChain with inline RouteConfig causes the gRPC client to remain in IDLE state
519- hcm := & hcmv3 .HttpConnectionManager {
520- CodecType : hcmv3 .HttpConnectionManager_AUTO ,
519+ hcm := & hcmv1 .HttpConnectionManager {
520+ CodecType : hcmv1 .HttpConnectionManager_AUTO ,
521521 StatPrefix : fmt .Sprintf ("outbound_%d_%s" , port , svc .Attributes .Name ),
522- RouteSpecifier : & hcmv3 .HttpConnectionManager_Rds {
523- Rds : & hcmv3 .Rds {
522+ RouteSpecifier : & hcmv1 .HttpConnectionManager_Rds {
523+ Rds : & hcmv1 .Rds {
524524 ConfigSource : & core.ConfigSource {
525525 ConfigSourceSpecifier : & core.ConfigSource_Ads {
526526 Ads : & core.AggregatedConfigSource {},
@@ -529,11 +529,11 @@ func buildOutboundListeners(node *model.Proxy, push *model.PushContext, filter l
529529 RouteConfigName : routeName ,
530530 },
531531 },
532- HttpFilters : []* hcmv3 .HttpFilter {
532+ HttpFilters : []* hcmv1 .HttpFilter {
533533 {
534534 Name : "filters.http.router" ,
535- ConfigType : & hcmv3 .HttpFilter_TypedConfig {
536- TypedConfig : protoconv .MessageToAny (& routerv3 .Router {}),
535+ ConfigType : & hcmv1 .HttpFilter_TypedConfig {
536+ TypedConfig : protoconv .MessageToAny (& routerv1 .Router {}),
537537 },
538538 },
539539 },
0 commit comments