Skip to content

Issue/136 #139

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

Merged
davecheney merged 3 commits into from
Jan 11, 2018
Merged

Issue/136 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7feb67f
gopkg.lock: update deps to get latest data-plane
davecheney Jan 11, 2018
574ea79
internal/envoy: generate envoy_grpc configuration stanza
davecheney Jan 11, 2018
70fddc9
internal/contour: add grpc_services stanza to listener
davecheney Jan 11, 2018
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
12 changes: 6 additions & 6 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion internal/contour/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,16 @@ func httpfilter(routename string) *v2.Filter {
"config_source": st(map[string]*types.Value{
"api_config_source": st(map[string]*types.Value{
"api_type": sv("grpc"),
"cluster_name": lv(
"cluster_names": lv(
sv("xds_cluster"),
),
"grpc_services": lv(
st(map[string]*types.Value{
"envoy_grpc": st(map[string]*types.Value{
"cluster_name": sv("xds_cluster"),
}),
}),
),
}),
}),
}),
Expand Down
10 changes: 8 additions & 2 deletions internal/envoy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,17 @@ const yamlConfig = `dynamic_resources:
lds_config:
api_config_source:
api_type: GRPC
cluster_name: [xds_cluster]
cluster_names: [xds_cluster]
grpc_services:
- envoy_grpc:
cluster_name: xds_cluster
cds_config:
api_config_source:
api_type: GRPC
cluster_name: [xds_cluster]
cluster_names: [xds_cluster]
grpc_services:
- envoy_grpc:
cluster_name: xds_cluster
static_resources:
clusters:
- name: xds_cluster
Expand Down
10 changes: 8 additions & 2 deletions internal/envoy/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,17 @@ func TestConfigWriter_WriteYAML(t *testing.T) {
lds_config:
api_config_source:
api_type: GRPC
cluster_name: [xds_cluster]
cluster_names: [xds_cluster]
grpc_services:
- envoy_grpc:
cluster_name: xds_cluster
cds_config:
api_config_source:
api_type: GRPC
cluster_name: [xds_cluster]
cluster_names: [xds_cluster]
grpc_services:
- envoy_grpc:
cluster_name: xds_cluster
static_resources:
clusters:
- name: xds_cluster
Expand Down