Skip to content

Commit 7d6c71b

Browse files
mfordjodymfordjody
authored
Remove envoy xds and replace it with xds api (#868)
1 parent 5725e22 commit 7d6c71b

File tree

30 files changed

+151
-214
lines changed

30 files changed

+151
-214
lines changed

‎dubbod/discovery/pkg/model/context.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ import (
3939
"github.com/apache/dubbo-kubernetes/pkg/util/protomarshal"
4040
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
4141
"github.com/apache/dubbo-kubernetes/pkg/xds"
42-
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
43-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
42+
// core "github.com/dubbo-kubernetes/xds-api/core/v1"
43+
core "github.com/dubbo-kubernetes/xds-api/core/v1"
44+
// discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
45+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
46+
4447
"google.golang.org/protobuf/types/known/structpb"
4548
)
4649

‎dubbod/discovery/pkg/model/typed_xds_cache.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/features"
2525
"github.com/apache/dubbo-kubernetes/pkg/slices"
2626
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
27-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
27+
// discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
28+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
2829
"github.com/hashicorp/golang-lru/v2/simplelru"
2930
)
3031

‎dubbod/discovery/pkg/model/xds_cache.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import (
2222
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/features"
2323
"github.com/apache/dubbo-kubernetes/pkg/config/schema/kind"
2424
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
25-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
25+
// discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
26+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
2627
)
2728

2829
type XdsCacheImpl struct {

‎dubbod/discovery/pkg/networking/grpcgen/cds.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ import (
2121
"strings"
2222

2323
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/util/protoconv"
24-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
24+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
2525

2626
networking "github.com/apache/dubbo-kubernetes/api/networking/v1alpha3"
2727
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
2828
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/networking/util"
2929
"github.com/apache/dubbo-kubernetes/pkg/config/host"
3030
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
31-
cluster "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
32-
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
33-
tlsv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
31+
cluster "github.com/dubbo-kubernetes/xds-api/cluster/v1"
32+
core "github.com/dubbo-kubernetes/xds-api/core/v1"
33+
tlsv3 "github.com/dubbo-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
3434
)
3535

3636
type clusterBuilder struct {
@@ -385,7 +385,7 @@ func (b *clusterBuilder) applyTLSForCluster(c *cluster.Cluster, subset *networki
385385
}
386386

387387
c.TransportSocket = &core.TransportSocket{
388-
Name: "envoy.transport_sockets.tls",
388+
Name: "transport_sockets.tls",
389389
ConfigType: &core.TransportSocket_TypedConfig{TypedConfig: protoconv.MessageToAny(tlsContext)},
390390
}
391391
log.Infof("applied %v TLS transport socket to cluster %s (SNI=%s)", mode, c.Name, sni)

‎dubbod/discovery/pkg/networking/grpcgen/grpcgen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
2121
v3 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v3"
2222
dubbolog "github.com/apache/dubbo-kubernetes/pkg/log"
23-
tlsv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
23+
tlsv3 "github.com/dubbo-kubernetes/xds-api/extensions/transport_sockets/tls/v1"
2424
)
2525

2626
var log = dubbolog.RegisterScope("grpcgen", "xDS Generator for Proxyless gRPC")

‎dubbod/discovery/pkg/networking/grpcgen/lds.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ import (
2929
"github.com/apache/dubbo-kubernetes/pkg/dubboagent/grpcxds"
3030
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
3131
"github.com/apache/dubbo-kubernetes/pkg/wellknown"
32-
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
33-
listener "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
34-
route "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
35-
routerv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
36-
hcmv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
37-
tlsv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
38-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
32+
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"
36+
listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
37+
route "github.com/dubbo-kubernetes/xds-api/route/v1"
38+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
3939
wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
4040
)
4141

@@ -238,7 +238,7 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
238238
},
239239
HttpFilters: []*hcmv3.HttpFilter{
240240
{
241-
Name: "envoy.filters.http.router",
241+
Name: "filters.http.router",
242242
ConfigType: &hcmv3.HttpFilter_TypedConfig{
243243
TypedConfig: protoconv.MessageToAny(&routerv3.Router{}),
244244
},
@@ -276,7 +276,7 @@ func buildInboundListeners(node *model.Proxy, push *model.PushContext, names []s
276276
},
277277
HttpFilters: []*hcmv3.HttpFilter{
278278
{
279-
Name: "envoy.filters.http.router",
279+
Name: "filters.http.router",
280280
ConfigType: &hcmv3.HttpFilter_TypedConfig{
281281
TypedConfig: protoconv.MessageToAny(&routerv3.Router{}),
282282
},
@@ -366,7 +366,7 @@ func buildDownstreamTransportSocket(mode model.MutualTLSMode) *core.TransportSoc
366366
// The ValidationContextType in CommonTlsContext handles client cert validation
367367
}
368368
return &core.TransportSocket{
369-
Name: "envoy.transport_sockets.tls",
369+
Name: "transport_sockets.tls",
370370
ConfigType: &core.TransportSocket_TypedConfig{TypedConfig: protoconv.MessageToAny(tlsContext)},
371371
}
372372
}
@@ -531,7 +531,7 @@ func buildOutboundListeners(node *model.Proxy, push *model.PushContext, filter l
531531
},
532532
HttpFilters: []*hcmv3.HttpFilter{
533533
{
534-
Name: "envoy.filters.http.router",
534+
Name: "filters.http.router",
535535
ConfigType: &hcmv3.HttpFilter_TypedConfig{
536536
TypedConfig: protoconv.MessageToAny(&routerv3.Router{}),
537537
},

‎dubbod/discovery/pkg/networking/grpcgen/rds.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222
"strings"
2323

2424
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/util/protoconv"
25-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
25+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
2626

2727
networking "github.com/apache/dubbo-kubernetes/api/networking/v1alpha3"
2828
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
2929
"github.com/apache/dubbo-kubernetes/pkg/config"
3030
"github.com/apache/dubbo-kubernetes/pkg/config/host"
31-
route "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
32-
matcher "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
31+
route "github.com/dubbo-kubernetes/xds-api/route/v1"
32+
matcher "github.com/dubbo-kubernetes/xds-api/type/matcher/v1"
3333
"google.golang.org/protobuf/types/known/wrapperspb"
3434
sigsk8siogatewayapiapisv1 "sigs.k8s.io/gateway-api/apis/v1"
3535
)
@@ -128,7 +128,6 @@ func buildHTTPRoute(node *model.Proxy, push *model.PushContext, routeName string
128128
}
129129
}
130130
}
131-
// Add HTTPRoute hostnames to domains (they will be matched by Envoy)
132131
for hostnameStr := range httpRouteHostnames {
133132
if hostnameStr != "*" {
134133
domains = append(domains, hostnameStr)
@@ -227,7 +226,6 @@ func buildHTTPRoute(node *model.Proxy, push *model.PushContext, routeName string
227226

228227
// For Gateway Pod, we also need to collect HTTPRoutes with specific hostnames
229228
// because Gateway Pods route traffic based on HTTPRoute hostnames in the request
230-
// We'll add all HTTPRoutes to the domains list so Envoy can match them
231229
if len(httpRoutes) > 0 {
232230
log.Infof("Gateway Pod inbound listener found %d HTTPRoute(s) for port %s", len(httpRoutes), routeName)
233231
// Collect all HTTPRoute hostnames and add them to domains

‎dubbod/discovery/pkg/networking/util/util.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"strings"
2323

2424
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
25-
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
26-
listener "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
25+
core "github.com/dubbo-kubernetes/xds-api/core/v1"
26+
listener "github.com/dubbo-kubernetes/xds-api/listener/v1"
2727
)
2828

2929
const (

‎dubbod/discovery/pkg/xds/ads.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
v3 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v3"
3030
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
3131
"github.com/apache/dubbo-kubernetes/pkg/xds"
32-
core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
33-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
32+
core "github.com/dubbo-kubernetes/xds-api/core/v1"
33+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
3434
"google.golang.org/grpc/codes"
3535
"google.golang.org/grpc/peer"
3636
"google.golang.org/grpc/status"

‎dubbod/discovery/pkg/xds/delta.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
2626
v3 "github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/xds/v3"
2727
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
28-
discovery "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
28+
discovery "github.com/dubbo-kubernetes/xds-api/service/discovery/v1"
2929
"github.com/google/uuid"
3030
"google.golang.org/grpc/codes"
3131
"google.golang.org/grpc/peer"
@@ -138,7 +138,6 @@ func (s *DiscoveryServer) receiveDelta(con *Connection, identities []string) {
138138
return
139139
}
140140
if firstRequest {
141-
// probe happens before envoy sends first xDS request
142141
if req.TypeUrl == v3.HealthInfoType {
143142
deltaLog.Warnf("%q %s send health check probe before normal xDS request", con.Peer(), con.ID())
144143
continue

0 commit comments

Comments
 (0)