Skip to content

Commit

Permalink
enable delta xDS
Browse files Browse the repository at this point in the history 
Signed-off-by: Steve Kriss <[email protected]>
  • Loading branch information
@skriss
skriss committed Mar 6, 2024
1 parent 488bdb4 commit 9716758
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 48 deletions.
60 changes: 30 additions & 30 deletions internal/envoy/v3/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -145,7 +145,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -190,7 +190,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -309,7 +309,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -324,7 +324,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -369,7 +369,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -488,7 +488,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -503,7 +503,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -548,7 +548,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -668,7 +668,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -683,7 +683,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -728,7 +728,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -848,7 +848,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -863,7 +863,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -908,7 +908,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1028,7 +1028,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -1043,7 +1043,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1088,7 +1088,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1210,7 +1210,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -1225,7 +1225,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1270,7 +1270,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1426,7 +1426,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -1441,7 +1441,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1486,7 +1486,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1640,7 +1640,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -1655,7 +1655,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1700,7 +1700,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down Expand Up @@ -1872,7 +1872,7 @@ func TestBootstrap(t *testing.T) {
"dynamic_resources": {
"lds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -1887,7 +1887,7 @@ func TestBootstrap(t *testing.T) {
},
"cds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand All @@ -1909,7 +1909,7 @@ func TestBootstrap(t *testing.T) {
"name": "dynamic",
"rtds_config": {
"api_config_source": {
"api_type": "GRPC",
"api_type": "DELTA_GRPC",
"transport_api_version": "V3",
"grpc_services": [
{
Expand Down
2 changes: 1 addition & 1 deletion internal/envoy/v3/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func ConfigSource(cluster string) *envoy_config_core_v3.ConfigSource {
ResourceApiVersion: envoy_config_core_v3.ApiVersion_V3,
ConfigSourceSpecifier: &envoy_config_core_v3.ConfigSource_ApiConfigSource{
ApiConfigSource: &envoy_config_core_v3.ApiConfigSource{
ApiType: envoy_config_core_v3.ApiConfigSource_GRPC,
ApiType: envoy_config_core_v3.ApiConfigSource_DELTA_GRPC,
TransportApiVersion: envoy_config_core_v3.ApiVersion_V3,
GrpcServices: []*envoy_config_core_v3.GrpcService{
GrpcService(cluster, "", timeout.DefaultSetting()),
Expand Down
Loading

0 comments on commit 9716758

Please sign in to comment.