Skip to content

Commit cf23bfb

Browse files
author
Kevin Dorosh
authored
Sync Gloo APIs to 1.5.21 (#89)
* Sync Gloo APIs to 1.5.21
1 parent 2c41d4b commit cf23bfb

File tree

32 files changed

+413
-62
lines changed

32 files changed

+413
-62
lines changed

api/gloo/gateway/v1/gateway.proto

-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ message TcpGateway {
103103
gloo.solo.io.TcpListenerOptions options = 8;
104104
}
105105

106-
107106
message GatewayStatus {
108107
enum State {
109108
// Pending status indicates the resource has not yet been validated

api/gloo/gloo/external/envoy/api/v2/cluster/outlier_detection.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ message OutlierDetection {
114114
// is set to true.
115115
google.protobuf.UInt32Value enforcing_local_origin_success_rate = 15
116116
[(validate.rules).uint32.lte = 100];
117-
}
117+
}

api/gloo/gloo/external/envoy/api/v2/core/health_check.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@ enum HealthStatus {
273273

274274
// Degraded.
275275
DEGRADED = 5;
276-
}
276+
}

api/gloo/gloo/external/envoy/api/v2/route/route.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1303,4 +1303,4 @@ message QueryParameterMatcher {
13031303
// the right of the equals sign in "key=value") must match the regex.
13041304
// E.g., the regex "\d+$" will match "123" but not "a123" or "123a".
13051305
google.protobuf.BoolValue regex = 4;
1306-
}
1306+
}

api/gloo/gloo/external/envoy/config/filter/http/gzip/v2/gzip.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ message Gzip {
8080
// which will produce a 4096 bytes window. For more details about this parameter, please refer to
8181
// zlib manual > deflateInit2.
8282
google.protobuf.UInt32Value window_bits = 9 [(validate.rules).uint32 = {lte: 15 gte: 9}];
83-
}
83+
}

api/gloo/gloo/external/envoy/extensions/filters/http/wasm/v3/wasm.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ option java_multiple_files = true;
2626
message Wasm {
2727
// General Plugin configuration.
2828
envoy.extensions.wasm.v3.PluginConfig config = 1;
29-
}
29+
}

api/gloo/gloo/external/envoy/extensions/transformation/transformation.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,4 @@ message Passthrough {}
236236

237237
message MergeExtractorsToBody {}
238238

239-
message HeaderBodyTransform {}
239+
message HeaderBodyTransform {}

api/gloo/gloo/external/envoy/type/range.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ message DoubleRange {
3232

3333
// end of the range (exclusive)
3434
double end = 2;
35-
}
35+
}

api/gloo/gloo/external/udpa/annotations/sensitive.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ extend google.protobuf.FieldOptions {
1212
// Protobuf functions such as `TextFormat::PrintToString`.
1313
bool sensitive = 76569463;
1414
}
15-
option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations";
15+
option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/udpa/annotations";

api/gloo/gloo/v1/endpoint.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ message Endpoint {
4040
message HealthCheckConfig {
4141
// hostname to use for the endpoint health checks if provided.
4242
string hostname = 1;
43-
}
43+
}

api/gloo/gloo/v1/enterprise/options/ratelimit/ratelimit.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ message RateLimitRouteExtension {
8484
// Define individual rate limits here. Each rate limit will be evaluated, if any rate limit
8585
// would be throttled, the entire request returns a 429 (gets throttled)
8686
repeated ratelimit.api.solo.io.RateLimitActions rate_limits = 2;
87-
}
87+
}

api/gloo/gloo/v1/enterprise/options/rbac/rbac.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ message Permissions {
5353
string path_prefix = 1;
5454
// What http methods (GET, POST, ...) are allowed.
5555
repeated string methods = 2;
56-
}
56+
}

api/gloo/gloo/v1/enterprise/options/waf/waf.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ message CoreRuleSet {
4242
// String representing the core rule set custom config options
4343
string custom_settings_file = 3;
4444
}
45-
}
45+
}

api/gloo/gloo/v1/extensions.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ message Extensions {
1515

1616
message Extension {
1717
google.protobuf.Struct config = 1;
18-
}
18+
}

api/gloo/gloo/v1/failover.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ message Locality {
115115
// into smaller chunks of sub-zones so they can be load balanced
116116
// independently.
117117
string sub_zone = 3;
118-
}
118+
}

api/gloo/gloo/v1/options/cors/cors.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ message CorsPolicy {
4242
// Optional, only applies to route-specific CORS Policies, defaults to false.
4343
// If set, the CORS Policy (specified on the virtual host) will be disabled for this route.
4444
bool disable_for_route = 8;
45-
}
45+
}

api/gloo/gloo/v1/options/grpc/grpc.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ message DestinationSpec {
4848
// Parameters describe how to extract the function parameters from the
4949
// request.
5050
transformation.options.gloo.solo.io.Parameters parameters = 4;
51-
}
51+
}

api/gloo/gloo/v1/options/grpc_json/grpc_json.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,4 @@ message GrpcJsonTranscoder {
158158
// the ``google/rpc/error_details.proto`` should be included in the configured
159159
// :ref:`proto descriptor set <config_grpc_json_generate_proto_descriptor_set>`.
160160
bool convert_grpc_status = 9;
161-
}
161+
}

api/gloo/gloo/v1/options/grpc_web/grpc_web.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ import "solo-apis/api/gloo/gloo/v1/options/transformation/parameters.proto";
1414
message GrpcWeb {
1515
// Disable grpc web support.
1616
bool disable = 1;
17-
}
17+
}

api/gloo/gloo/v1/options/rest/rest.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ message DestinationSpec {
2929
transformation.options.gloo.solo.io.Parameters parameters = 2;
3030

3131
envoy.api.v2.filter.http.TransformationTemplate response_transformation = 3;
32-
}
32+
}

api/gloo/gloo/v1/options/service_spec.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ message ServiceSpec {
2222
rest.options.gloo.solo.io.ServiceSpec rest = 1;
2323
grpc.options.gloo.solo.io.ServiceSpec grpc = 2;
2424
}
25-
}
25+
}

api/gloo/gloo/v1/options/stats/stats.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ message VirtualCluster {
4343

4444
// If specified, statistics will be exposed only for requests matching the given HTTP method.
4545
string method = 3;
46-
}
46+
}

api/gloo/gloo/v1/options/tcp/tcp.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ option (extproto.hash_all) = true;
1616
message TcpProxySettings {
1717
google.protobuf.UInt32Value max_connect_attempts = 1;
1818
google.protobuf.Duration idle_timeout = 2 [ (gogoproto.stdduration) = true ];
19-
}
19+
}

api/gloo/gloo/v1/options/tracing/tracing.proto

+25
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ message ListenerTracingSettings {
2222
// Requests can produce traces by random sampling or when the `x-client-trace-id` header is provided.
2323
// TracePercentages defines the limits for random, forced, and overall tracing percentages.
2424
TracePercentages trace_percentages = 3;
25+
// Optional. If specified, Envoy will include the environment variables with the given tag as tracing tags.
26+
repeated TracingTagEnvironmentVariable environment_variables_for_tags = 6;
27+
// Optional. If specified, Envoy will include the literals with the given tag as tracing tags.
28+
repeated TracingTagLiteral literals_for_tags = 7;
2529
}
2630

2731
// Contains settings for configuring Envoy's tracing capabilities at the route level.
@@ -55,3 +59,24 @@ message TracePercentages {
5559
// This should be a value between 0.0 and 100.0, with up to 6 significant digits.
5660
google.protobuf.FloatValue overall_sample_percentage = 3;
5761
}
62+
63+
// Requests can produce traces with custom tags.
64+
// TracingTagEnvironmentVariable defines an environment variable which gets added as custom tag.
65+
message TracingTagEnvironmentVariable {
66+
// Used to populate the tag name.
67+
string tag = 1;
68+
// Environment variable name to obtain the value to populate the tag value.
69+
string name = 2;
70+
// When the environment variable is not found, the tag value will be populated with this default value if specified,
71+
// otherwise no tag will be populated.
72+
string default_value = 3;
73+
}
74+
75+
// Requests can produce traces with custom tags.
76+
// TracingTagLiteral defines a literal which gets added as custom tag.
77+
message TracingTagLiteral {
78+
// Used to populate the tag name.
79+
string tag = 1;
80+
// Static literal value to populate the tag value.
81+
string value = 2;
82+
}

api/gloo/gloo/v1/options/transformation/transformation.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ message TransformationStages {
5757
RequestResponseTransformations early = 1;
5858
// Regular transformations happen after Auth and Rate limit decisions has been made.
5959
RequestResponseTransformations regular = 2;
60-
}
60+
}

api/gloo/gloo/v1/options/wasm/wasm.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,4 @@ message FilterStage {
8080
Stage stage = 1;
8181
// How this filter should be placed relative to the stage
8282
Predicate predicate = 2;
83-
}
83+
}

api/gloo/gloo/v1/proxy.proto

-1
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@ message DirectResponseAction {
387387
string body = 2;
388388
}
389389

390-
391390
message UpstreamGroupStatus {
392391
enum State {
393392
// Pending status indicates the resource has not yet been validated

api/gloo/gloo/v1/ssl.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,4 @@ message SslParameters {
119119
ProtocolVersion maximum_protocol_version = 2;
120120
repeated string cipher_suites = 3;
121121
repeated string ecdh_curves = 4;
122-
}
122+
}

api/gloo/gloo/v1/subset.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ option (extproto.hash_all) = true;
99

1010
message Subset {
1111
map<string, string> values = 1;
12-
}
12+
}

0 commit comments

Comments
 (0)