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

NET-4858 - xds v2 - implement base connect proxy functionality for routes #18501

Merged
merged 16 commits into from
Aug 17, 2023
Merged

NET-4858 - xds v2 - implement base connect proxy functionality for routes #18501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
735ccc5
NET-4853 - xds v2 - implement base connect proxy functionality for cl…
jmurret Aug 17, 2023
1b2319b
NET-4853 - xds v2 - implement base connect proxy functionality for cl…
jmurret Aug 17, 2023
2f4166e
NET-4932 - xds v2 - implement base connect proxy functionality for en…
jmurret Aug 17, 2023
25f6a71
Merge branch 'jm/NET-4853' into jm/NET-4932
jmurret Aug 17, 2023
a0eaa92
Update endpoints_test.go
jmurret Aug 17, 2023
e8aca7c
gofmt
jmurret Aug 17, 2023
978133d
NET-4858 - Make connect proxy route tests pass using xds v2
jmurret Aug 17, 2023
fa307d3
Merge branch 'main' into jm/NET-4858
jmurret Aug 17, 2023
376b016
Update endpoints_test.go
jmurret Aug 17, 2023
8f0060e
Update naming.go
jmurret Aug 17, 2023
502784b
use alsoRunTestForV2
jmurret Aug 17, 2023
5b114ae
remove unused makeAddress
jmurret Aug 17, 2023
f91600b
gofmt
jmurret Aug 17, 2023
fb846a4
Merge branch 'main' into jm/NET-4858
jmurret Aug 17, 2023
03cf5dd
fixing clusters
jmurret Aug 17, 2023
4758e51
Merge branch 'main' into jm/NET-4858
jmurret Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions agent/xds/clusters_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ func makeClusterDiscoChainTests(enterprise bool) []clusterTestCase {
create: func(t testinf.T) *proxycfg.ConfigSnapshot {
return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple-with-overrides", enterprise, nil, nil)
},
// TODO(proxystate): requires routes work
alsoRunTestForV2: false,
alsoRunTestForV2: true,
},
{
name: "connect-proxy-with-chain-and-failover",
Expand Down Expand Up @@ -176,16 +175,14 @@ func makeClusterDiscoChainTests(enterprise bool) []clusterTestCase {
create: func(t testinf.T) *proxycfg.ConfigSnapshot {
return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", enterprise, nil, nil)
},
// TODO(proxystate): requires routes work
alsoRunTestForV2: false,
alsoRunTestForV2: true,
},
{
name: "connect-proxy-lb-in-resolver",
create: func(t testinf.T) *proxycfg.ConfigSnapshot {
return proxycfg.TestConfigSnapshotDiscoveryChain(t, "lb-resolver", enterprise, nil, nil)
},
// TODO(proxystate): requires routes work
alsoRunTestForV2: false,
alsoRunTestForV2: true,
},
}
}
Expand Down
7 changes: 2 additions & 5 deletions agent/xds/endpoints_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
"github.com/hashicorp/consul/agent/proxycfg"
"github.com/hashicorp/consul/agent/structs"

"github.com/hashicorp/consul/agent/xds/proxystateconverter"
"github.com/hashicorp/consul/agent/xds/response"
"github.com/hashicorp/consul/agent/xds/testcommon"
Expand Down Expand Up @@ -267,8 +266,7 @@ func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
create: func(t testinf.T) *proxycfg.ConfigSnapshot {
return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple-with-overrides", enterprise, nil, nil)
},
// TODO(proxystate): requires routes work
alsoRunTestForV2: false,
alsoRunTestForV2: true,
},
{
name: "connect-proxy-with-chain-and-failover",
Expand Down Expand Up @@ -351,8 +349,7 @@ func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
create: func(t testinf.T) *proxycfg.ConfigSnapshot {
return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", enterprise, nil, nil)
},
// TODO(proxystate): requires routes work
alsoRunTestForV2: false,
alsoRunTestForV2: true,
},
}
}
Expand Down
3 changes: 2 additions & 1 deletion agent/xds/proxystateconverter/clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"strings"
"time"

envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/wrapperspb"

Expand Down Expand Up @@ -1021,7 +1022,7 @@ func configureClusterWithHostnames(
dnsEndpointGroup.Config.DiscoveryType = pbproxystate.DiscoveryType_DISCOVERY_TYPE_STRICT
}

endpoints := make([]*pbproxystate.Endpoint, 0, 1)
endpoints := make([]*envoy_endpoint_v3.LbEndpoint, 0, 1)
uniqueHostnames := make(map[string]bool)

var (
Expand Down
10 changes: 6 additions & 4 deletions agent/xds/proxystateconverter/converter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@ func (g *Converter) resourcesFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot) erro
if err != nil {
return err
}
//err = g.routesFromSnapshot(cfgSnap)
//if err != nil {
// return err
//}

err = g.routesFromSnapshot(cfgSnap)
if err != nil {
return err
}

//g.secretsFromSnapshot(cfgSnap)
return nil
}
Expand Down
Loading
Loading