Skip to content

Commit

Permalink
Sync Gloo Mesh APIs. Destination Branch: gloo-mesh-v2.4.x (#1101)
Browse files Browse the repository at this point in the history
Co-authored-by: soloio-bot <[email protected]>
  • Loading branch information
soloio-bot and soloio-bot authored Dec 29, 2023
1 parent eec0be6 commit 906e217
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 698 deletions.
11 changes: 6 additions & 5 deletions api/gloo.solo.io/admin/v2/ext_auth_server.proto
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,17 @@ message ExtAuthServerSpec {
// Set this if you also want to send the body of the request, and not just the headers.
BufferSettings request_body = 5;

// Clears route cache in order to allow the external authorization service to correctly affect
// routing decisions. Filter clears all cached routes when:
// Clear the route cache to force the external auth service to recalculate the routing decision.
// All cached routes are cleared if one of the following conditions is met.
//
// 1. The field is set to *true*.
//
// 2. The status returned from the authorization service is a HTTP 200 or gRPC 0.
// 2. The external auth service returns a HTTP 200 or gRPC 0 response code.
//
// 3. At least one *authorization response header* is added to the client request, or is used for
// altering another client request header.
// 3. At least one *authorization response header* is added to the client request, or is used to
// alter another client request header.
//
// The default value is **false**.
bool clear_route_cache = 6;

// Sets the HTTP status that is returned to the client when there is a network error between the
Expand Down
3 changes: 3 additions & 0 deletions api/gloo.solo.io/networking/v2/external_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ message ExternalServiceSpec {
// A list of egress VirtualGateways via which this ExternalService is reachable.
// This is required in meshes that are configured to deny all traffic that is not explicitly allowed.
// Requires the ExternalService to use Hosts rather than Addresses.
// Currently only supported for ExternalService ports with HTTP, HTTP2, and HTTPS protocols.
EgressGatewayRoutes egress_gateway_routes = 6;

message TlsConfig {
Expand Down Expand Up @@ -115,6 +116,8 @@ message ExternalServiceSpec {
// The port number to match for traffic originating from the mesh.
// default to 80.
// must be unique for each ExternalService port.
// Note that if this field matches any ExternalService non-egress port (spec.ports.number),
// requests to this port may not be routed through the egress gateway.
uint32 port_match = 1;

// Reference to the virtual gateways to use for egress.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ message TransformationPolicySpec {

message RequestTransformation {

// If the request was transformed such that it would match a different route,
// recalculate the routing destination (select a new route) based on the transformed content of the request.
// If set to **true**, recalculate the routing destination and select a new route for transformed requests.
// For example, if you have a request that is transformed to match a new route, the new route is selected
// when calculating the routing destination. The default value is **false**.
bool recalculate_routing_destination = 1;

// transform HTTP body and headers using Inja templates.
Expand Down
12 changes: 7 additions & 5 deletions client-go/admin.gloo.solo.io/v2/ext_auth_server.pb.go

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

3 changes: 3 additions & 0 deletions client-go/networking.gloo.solo.io/v2/external_service.pb.go

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

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

36 changes: 11 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/solo-io/solo-apis

go 1.21

toolchain go1.21.1
go 1.21.5

require (
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4
Expand Down Expand Up @@ -31,11 +29,11 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sys v0.12.0 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.2
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.15.0 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0 // indirect
istio.io/api v0.0.0-20230803063743-0b7b8bc2e0bb
Expand All @@ -49,7 +47,7 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

require google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
require google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d

require (
github.com/google/go-cmp v0.5.9 // indirect
Expand All @@ -62,7 +60,7 @@ require (
require (
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
)

require (
Expand All @@ -86,8 +84,8 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
golang.org/x/term v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -99,8 +97,7 @@ require (

replace (
github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.2
github.com/docker/docker => github.com/docker/docker v23.0.1+incompatible
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.11.1-0.20230416233444-7f2a3030ef40
github.com/docker/docker => github.com/docker/docker v23.0.3+incompatible

// anyvendor (used in check-code-gen in CI) requires version v5.3.0, but solo-io/go-utils overrides it
github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.3.0
Expand All @@ -115,17 +112,6 @@ replace (
// as to why we are using a private fork.
go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20210831235406-48667b93284d

// Using grpc v1.54.0 since pkg/meshctl/commands/generate/graphql/grpc/grpc.go imports
// hjump/protoreflect which imports a package test/grpc_testing which has been moved to interop/grpc_testing
// in the grpc repo - https://github.com/grpc/grpc-go/pull/6164 since grpc v1.55.0.
// This causes v1.55.0+ to not be backwards compatible with v1.54.0 and below if the grpc_testing package is imported.
// Pinned to v1.54.0 until either hjump/protoreflect is updated to grpc v1.55.0+
// or this is fixed in a newer version of grpc.
google.golang.org/grpc => google.golang.org/grpc v1.54.0

// 1.18
istio.io/istio => istio.io/istio v0.0.0-20230824050558-a835e9cca9eb

k8s.io/client-go => k8s.io/client-go v0.28.1

// We're using our controller-runtime fork to pick an upstream commit that hasn't made
Expand Down
Loading

0 comments on commit 906e217

Please sign in to comment.