Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-28 00:34:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source 
Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2020-02-03 19:46:41 +01:00
parent fc86e8f832
commit 3f1fd6d08c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/traffic/xds/client.go
View File

@@ -42,8 +42,8 @@ import (
var log = clog.NewWithPlugin("traffic: xds") var log = clog.NewWithPlugin("traffic: xds")
const ( const (
cdsURL = "type.googleapis.com/envoy.api.v2.Cluster" cdsURL = "type.googleapis.com/envoy.config.cluster.v3.Cluster"
edsURL = "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment" edsURL = "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment"
) )
type adsStream xdspb.AggregatedDiscoveryService_StreamAggregatedResourcesClient type adsStream xdspb.AggregatedDiscoveryService_StreamAggregatedResourcesClient
@@ -74,6 +74,7 @@ func New(addr, node string, opts ...grpc.DialOption) (*Client, error) {
Metadata: &structpb.Struct{ Metadata: &structpb.Struct{
Fields: map[string]*structpb.Value{ Fields: map[string]*structpb.Value{
"HOSTNAME": {Kind: &structpb.Value_StringValue{StringValue: hostname}}, "HOSTNAME": {Kind: &structpb.Value_StringValue{StringValue: hostname}},
"BUILDV": {Kind: &structpb.Value_StringValue{StringValue: "CoreDNS"}},
"BUILDVERSION": {Kind: &structpb.Value_StringValue{StringValue: coremain.CoreVersion}}, "BUILDVERSION": {Kind: &structpb.Value_StringValue{StringValue: coremain.CoreVersion}},
}, },
}, },
@@ -165,7 +166,7 @@ func (c *Client) endpointDiscovery(stream adsStream, version, nonce string, clus
return stream.Send(req) return stream.Send(req)
} }
// receive receives from the stream, it handled both cluster and endpoint DiscoveryResponses. // receive receives from the stream, it handles both cluster and endpoint DiscoveryResponses.
func (c *Client) receive(stream adsStream) error { func (c *Client) receive(stream adsStream) error {
for { for {
resp, err := stream.Recv() resp, err := stream.Recv()