Skip to content

Commit

Permalink
more changes to get back to v0.9.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@rboyer
rboyer committed Jan 25, 2021
1 parent 62d4418 commit 5480aca
Show file tree
Hide file tree
Showing 40 changed files with 76 additions and 137 deletions.
3 changes: 1 addition & 2 deletions agent/xds/listeners.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
envoyhttp "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2"
envoytcp "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/tcp_proxy/v2"
envoytype "github.com/envoyproxy/go-control-plane/envoy/type"
"github.com/envoyproxy/go-control-plane/pkg/wellknown"

"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
Expand Down Expand Up @@ -1120,7 +1119,7 @@ func makeListenerFilter(opts listenerFilterOpts) (*envoylistener.Filter, error)
}

func makeTLSInspectorListenerFilter() (*envoylistener.ListenerFilter, error) {
return &envoylistener.ListenerFilter{Name: wellknown.TlsInspector}, nil
return &envoylistener.ListenerFilter{Name: "envoy.filters.listener.tls_inspector"}, nil
}

func makeSNIFilterChainMatch(sniMatch string) *envoylistener.FilterChainMatch {
Expand Down
3 changes: 3 additions & 0 deletions agent/xds/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -737,16 +737,19 @@ func TestServer_StreamAggregatedResources_IngressEmptyResponse(t *testing.T) {
emptyClusterJSON := `{
"versionInfo": "` + hexString(1) + `",
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"resources": [],
"nonce": "` + hexString(1) + `"
}`
emptyListenerJSON := `{
"versionInfo": "` + hexString(1) + `",
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"resources": [],
"nonce": "` + hexString(2) + `"
}`
emptyRouteJSON := `{
"versionInfo": "` + hexString(1) + `",
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"resources": [],
"nonce": "` + hexString(3) + `"
}`

Expand Down
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Cluster",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/defaults-no-chain.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain.envoy-1-14-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
2 changes: 2 additions & 0 deletions agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"versionInfo": "00000001",
"resources": [
],
"typeUrl": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"nonce": "00000001"
}
Loading

0 comments on commit 5480aca

Please sign in to comment.