Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xds/resource: accept Self as LDS's RDS config source and CDS's EDS config source #5152

Merged
merged 1 commit into from Jan 26, 2022
Merged

xds/resource: accept Self as LDS's RDS config source and CDS's EDS config source #5152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions xds/internal/xdsclient/xdsresource/unmarshal_cds.go
View file
Open in desktop
Expand Up @@ -136,8 +136,8 @@ func validateClusterAndConstructClusterUpdate(cluster *v3clusterpb.Cluster) (Clu
// Validate and set cluster type from the response.
switch {
case cluster.GetType() == v3clusterpb.Cluster_EDS:
if cluster.GetEdsClusterConfig().GetEdsConfig().GetAds() == nil {
return ClusterUpdate{}, fmt.Errorf("unexpected edsConfig in response: %+v", cluster)
if configsource := cluster.GetEdsClusterConfig().GetEdsConfig(); configsource.GetAds() == nil && configsource.GetSelf() == nil {
return ClusterUpdate{}, fmt.Errorf("CDS's EDS config source is not ADS or Self: %+v", cluster)
}
ret.ClusterType = ClusterTypeEDS
ret.EDSServiceName = cluster.GetEdsClusterConfig().GetServiceName()
Expand Down
32 changes: 32 additions & 0 deletions xds/internal/xdsclient/xdsresource/unmarshal_cds_test.go
View file
Open in desktop
Expand Up @@ -1421,6 +1421,23 @@ func (s) TestUnmarshalCluster(t *testing.T) {
},
},
})

v3ClusterAnyWithEDSConfigSourceSelf = testutils.MarshalAny(&v3clusterpb.Cluster{
Name: v3ClusterName,
ClusterDiscoveryType: &v3clusterpb.Cluster_Type{Type: v3clusterpb.Cluster_EDS},
EdsClusterConfig: &v3clusterpb.Cluster_EdsClusterConfig{
EdsConfig: &v3corepb.ConfigSource{
ConfigSourceSpecifier: &v3corepb.ConfigSource_Self{},
},
ServiceName: v3Service,
},
LbPolicy: v3clusterpb.Cluster_ROUND_ROBIN,
LrsServer: &v3corepb.ConfigSource{
ConfigSourceSpecifier: &v3corepb.ConfigSource_Self{
Self: &v3corepb.SelfConfigSource{},
},
},
})
)
const testVersion = "test-version-cds"

Expand Down Expand Up @@ -1513,6 +1530,21 @@ func (s) TestUnmarshalCluster(t *testing.T) {
Version: testVersion,
},
},
{
name: "v3 cluster with EDS config source self",
resources: []*anypb.Any{v3ClusterAnyWithEDSConfigSourceSelf},
wantUpdate: map[string]ClusterUpdateErrTuple{
v3ClusterName: {Update: ClusterUpdate{
ClusterName: v3ClusterName,
EDSServiceName: v3Service, EnableLRS: true,
Raw: v3ClusterAnyWithEDSConfigSourceSelf,
}},
},
wantMD: UpdateMetadata{
Status: ServiceStatusACKed,
Version: testVersion,
},
},
{
name: "multiple clusters",
resources: []*anypb.Any{v2ClusterAny, v3ClusterAny},
Expand Down
4 changes: 2 additions & 2 deletions xds/internal/xdsclient/xdsresource/unmarshal_lds.go
View file
Open in desktop
Expand Up @@ -102,8 +102,8 @@ func processClientSideListener(lis *v3listenerpb.Listener, logger *grpclog.Prefi

switch apiLis.RouteSpecifier.(type) {
case *v3httppb.HttpConnectionManager_Rds:
if apiLis.GetRds().GetConfigSource().GetAds() == nil {
return nil, fmt.Errorf("ConfigSource is not ADS: %+v", lis)
if configsource := apiLis.GetRds().GetConfigSource(); configsource.GetAds() == nil && configsource.GetSelf() == nil {
return nil, fmt.Errorf("LDS's RDS configSource is not ADS or Self: %+v", lis)
}
name := apiLis.GetRds().GetRouteConfigName()
if name == "" {
Expand Down
36 changes: 35 additions & 1 deletion xds/internal/xdsclient/xdsresource/unmarshal_lds_test.go
View file
Open in desktop
Expand Up @@ -204,6 +204,25 @@ func (s) TestUnmarshalListener_ClientSide(t *testing.T) {
},
})
}

v3ListenerWithCDSConfigSourceSelf = testutils.MarshalAny(&v3listenerpb.Listener{
Name: v3LDSTarget,
ApiListener: &v3listenerpb.ApiListener{
ApiListener: testutils.MarshalAny(
&v3httppb.HttpConnectionManager{
RouteSpecifier: &v3httppb.HttpConnectionManager_Rds{
Rds: &v3httppb.Rds{
ConfigSource: &v3corepb.ConfigSource{
ConfigSourceSpecifier: &v3corepb.ConfigSource_Self{},
},
RouteConfigName: v3RouteConfigName,
},
},
HttpFilters: []*v3httppb.HttpFilter{emptyRouterFilter},
}),
},
})

errMD = UpdateMetadata{
Status: ServiceStatusNACKed,
Version: testVersion,
Expand Down Expand Up @@ -294,7 +313,22 @@ func (s) TestUnmarshalListener_ClientSide(t *testing.T) {
wantErr: true,
},
{
name: "rds.ConfigSource in apiListener is not ADS",
name: "rds.ConfigSource in apiListener is Self",
resources: []*anypb.Any{v3ListenerWithCDSConfigSourceSelf},
wantUpdate: map[string]ListenerUpdateErrTuple{
v3LDSTarget: {Update: ListenerUpdate{
RouteConfigName: v3RouteConfigName,
HTTPFilters: []HTTPFilter{routerFilter},
Raw: v3ListenerWithCDSConfigSourceSelf,
}},
},
wantMD: UpdateMetadata{
Status: ServiceStatusACKed,
Version: testVersion,
},
},
{
name: "rds.ConfigSource in apiListener is not ADS or Self",
resources: []*anypb.Any{testutils.MarshalAny(&v3listenerpb.Listener{
Name: v3LDSTarget,
ApiListener: &v3listenerpb.ApiListener{
Expand Down