Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 51 additions & 5 deletions api/gloo/enterprise.gloo/v1/auth_config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1504,16 +1504,14 @@ message PassThroughGrpc {
// Timeout for the auth server to respond. Defaults to 5s
google.protobuf.Duration connection_timeout = 2;

// TLS config for the Grpc passthrough, if not configured the connection will use insecure.
PassThroughGrpcTLSConfig tlsConfig =3;
// TLS config for the gRPC passthrough, if not configured the connection will use insecure.
// When specified, this supports configuration for either simple TLS or mTLS.
PassThroughGrpcTLSConfig tls_config = 3;

// Indicates the retry policy for re-establishing the gRPC stream.
// This field is optional and failed calls will not retry unless configured.
RetryPolicy retry_policy = 4;
}
// TLS configuration for the extauth grpc passthrough connection
message PassThroughGrpcTLSConfig {
}

// Authorizes requests by making a POST HTTP/1 request to a custom HTTP auth server
// Assumes the request is authorized if the server returns a OK (200) status code,
Expand Down Expand Up @@ -1619,6 +1617,54 @@ message PassThroughHttp {

// Timeout for the auth server to respond. Defaults to 5s
google.protobuf.Duration connection_timeout = 8;

// TLS config for the HTTP passthrough, if not configured the connection will use insecure.
// When specified, this supports configuration for either simple TLS or mTLS.
PassThroughHttpTLSConfig tls_config = 9;
}

// TLS configuration for the extauth gRPC passthrough connection
message PassThroughGrpcTLSConfig {
// SecretRef contains the secret ref to a Kubernetes tls secret.
// This secret can contain the certificate, key and CA bundle to establish mTLS.
// If CA is not provided it will attempt to perform a simple TLS.
core.solo.io.ResourceRef secret_ref = 1;

// Additional TLS parameters
SslParameters ssl_params = 2;
}

// TLS configuration for the extauth HTTP passthrough connection
message PassThroughHttpTLSConfig {
// SecretRef contains the secret ref to a Kubernetes tls secret.
// This secret can contain the certificate, key and CA bundle to establish mTLS.
// If CA is not provided it will attempt to perform a simple TLS.
core.solo.io.ResourceRef secret_ref = 1;

// Additional TLS parameters
SslParameters ssl_params = 2;
}

message SslParameters {
enum ProtocolVersion {
// TLS auto select the optimal settings
TLSv1_AUTO = 0;

// TLS 1.1
TLSv1_1 = 1;

// TLS 1.2
TLSv1_2 = 2;

// TLS 1.3
TLSv1_3 = 3;
}

// Minimum TLS protocol version. If not defined this will be defaulting to `TLSv1_2`.
ProtocolVersion minimum_protocol_version = 1;

// Maximum TLS protocol version. This will be defaulting to `TLS_AUTO` if not specified.
ProtocolVersion maximum_protocol_version = 2;
}

// PortalAuth is used to authorize requests for credentials generated by the portal web server.
Expand Down
5 changes: 3 additions & 2 deletions api/gloo/gloo/v1/enterprise/options/ai/ai.proto
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,9 @@ message UpstreamSpec {
// or to use a different backend that is API-compliant with the upstream version.
// Note: For AWS Bedrock, if custom_host is set, host_rewrite will be used to override the Host header before signing the request
CustomHost custom_host = 2;
// Optional: Sets the model-id name.
// If unset, the model name is taken from the request.
// Required: model string.
//
// The model field is the supported model id published by AWS. See <https://docs.aws.amazon.com/bedrock/latest/userguide/models-supported.html>
string model = 3;
// Required: region string.
//
Expand Down
29 changes: 16 additions & 13 deletions api/gloo/gloo/v1/options/als/als.proto
Original file line number Diff line number Diff line change
Expand Up @@ -111,23 +111,26 @@ message OpenTelemetryService {
// zone_name, cluster_name, node_name
bool disable_builtin_labels = 4;

// A value containing the body of the log record. Can be for example a human-readable
// string message (including multi-line) describing the event in a free form or it can
// be a structured data composed of arrays and maps of other values.
// The body of the log record. Supported formats include human-readable
// string messages, including multiline, that describe the event in free form, or
// structured data composed of arrays and maps of other values. For more
// information about the format, see the [OpenTelementry `common.proto`](https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/common/v1/common.proto).
//
// Example: {"int_value": 1}
// Example: {"string_value": "hello world"}
// Example: {"kvlist_value": {"values": [{"key": "k1", "value": {"int_value": 1}}, {"key": "k2", "value": {"string_value": "v2"}}]}}
// Example: {"array_value": {"values": [{"int_value": 1}, {"string_value": "hello world"}]}}
// </br></br>Examples:
// <ul><li>{"int_value": 1}</li>
// <li>{"string_value": "hello world"}</li>
// <li>{"kvlist_value": {"values": [{"key": "k1", "value": {"int_value": 1}}, {"key": "k2", "value": {"string_value": "v2"}}]}}</li>
// <li>{"array_value": {"values": [{"int_value": 1}, {"string_value": "hello world"}]}}</li></ul>
opentelemetry.proto.common.v1.AnyValue body = 5;

// Additional attributes that describe the specific event occurrence. [Optional].
// Attribute keys MUST be unique (it is not allowed to have more than one
// attribute with the same key).
// Optional: Additional attributes that describe the specific event occurrence.
// Attribute keys must be unique to each attribute. For more
// information about the format, see the [OpenTelementry `common.proto`](https://github.com/open-telemetry/opentelemetry-proto/blob/main/opentelemetry/proto/common/v1/common.proto).
//
// Example: {"values": [{"key": "k1", "value": {"int_value": 1}}, {"key": "k2", "value": {"string_value": "v2"}}]}
// Example: {"values": [{"key": "k1", "values": {kvlist_value: {values: [{"key": "k2", "value": {"int_value": 1}}, {"key": "k3", "value": {"string_value": "v2"}}]}}}]}
// Example: {"values": [{"key": "k1", "value": {"int_value": 1}}, {"key": "k2", "value": {"string_value": "v2"}}]}
// </br></br>Examples:
// <ul><li>{"values": [{"key": "k1", "value": {"int_value": 1}}, {"key": "k2", "value": {"string_value": "v2"}}]}</li>
// <li>{"values": [{"key": "k1", "values": {kvlist_value: {values: [{"key": "k2", "value": {"int_value": 1}}, {"key": "k3", "value": {"string_value": "v2"}}]}}}]}</li>
// <li>{"values": [{"key": "k1", "value": {"int_value": 1}}, {"key": "k2", "value": {"string_value": "v2"}}]}</li></ul>
opentelemetry.proto.common.v1.KeyValueList attributes = 6;
}

Expand Down
78 changes: 67 additions & 11 deletions pkg/api/enterprise.gloo.solo.io/v1/auth_config.pb.clone.go

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

Loading
Loading