Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/bufbuild/buf-break…
Browse files Browse the repository at this point in the history 
…ing-action-1.1.3
  • Loading branch information
@unmultimedio
unmultimedio authored Aug 30, 2023
2 parents 49f08c0 + 435663f commit 202cf16
Show file tree
Hide file tree
Showing 14 changed files with 2,111 additions and 6 deletions.
34 changes: 34 additions & 0 deletions ...ae3c6f593d4b04b0ee8c64f2d948ffe95e713fbca7dc0a448d0444f092cebcac273d1fcfbe0448788d044a239
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
syntax = "proto3";

package envoy.extensions.filters.http.tap.v3;

import "envoy/extensions/common/tap/v3/common.proto";

import "udpa/annotations/status.proto";
import "udpa/annotations/versioning.proto";
import "validate/validate.proto";

option java_package = "io.envoyproxy.envoy.extensions.filters.http.tap.v3";
option java_outer_classname = "TapProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/tap/v3;tapv3";
option (udpa.annotations.file_status).package_version_status = ACTIVE;

// [#protodoc-title: Tap]
// Tap :ref:`configuration overview <config_http_filters_tap>`.
// [#extension: envoy.filters.http.tap]

// Top level configuration for the tap filter.
message Tap {
option (udpa.annotations.versioning).previous_message_type =
"envoy.config.filter.http.tap.v2alpha.Tap";

// Common configuration for the HTTP tap filter.
common.tap.v3.CommonExtensionConfig common_config = 1
[(validate.rules).message = {required: true}];

// Indicates whether HTTP tap filter records the time stamp for request/response headers.
// Request headers time stamp is stored after receiving request headers.
// Response headers time stamp is stored after receiving response headers.
bool record_headers_received_time = 2;
}
543 changes: 543 additions & 0 deletions ...17fbd7547d615387f5b6e5da05e5311ec1ad2ff39f5cd66b447508d5758b0bf9194fd2d3c93f514e04e59ae47
View file

Large diffs are not rendered by default.

80 changes: 80 additions & 0 deletions ...5da9f74e9cff9346eea6a6cdb09595ffde0adc1ff881e5dea59181f69e5fe0a88103e07deb660c3ebe9baeb66
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
syntax = "proto3";

package envoy.data.tap.v3;

import "envoy/config/core/v3/base.proto";
import "envoy/data/tap/v3/common.proto";

import "google/protobuf/timestamp.proto";

import "udpa/annotations/status.proto";
import "udpa/annotations/versioning.proto";

option java_package = "io.envoyproxy.envoy.data.tap.v3";
option java_outer_classname = "HttpProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/data/tap/v3;tapv3";
option (udpa.annotations.file_status).package_version_status = ACTIVE;

// [#protodoc-title: HTTP tap data]

// A fully buffered HTTP trace message.
message HttpBufferedTrace {
option (udpa.annotations.versioning).previous_message_type =
"envoy.data.tap.v2alpha.HttpBufferedTrace";

// HTTP message wrapper.
message Message {
option (udpa.annotations.versioning).previous_message_type =
"envoy.data.tap.v2alpha.HttpBufferedTrace.Message";

// Message headers.
repeated config.core.v3.HeaderValue headers = 1;

// Message body.
Body body = 2;

// Message trailers.
repeated config.core.v3.HeaderValue trailers = 3;

// The timestamp after receiving the message headers.
google.protobuf.Timestamp headers_received_time = 4;
}

// Request message.
Message request = 1;

// Response message.
Message response = 2;
}

// A streamed HTTP trace segment. Multiple segments make up a full trace.
// [#next-free-field: 8]
message HttpStreamedTraceSegment {
option (udpa.annotations.versioning).previous_message_type =
"envoy.data.tap.v2alpha.HttpStreamedTraceSegment";

// Trace ID unique to the originating Envoy only. Trace IDs can repeat and should not be used
// for long term stable uniqueness.
uint64 trace_id = 1;

oneof message_piece {
// Request headers.
config.core.v3.HeaderMap request_headers = 2;

// Request body chunk.
Body request_body_chunk = 3;

// Request trailers.
config.core.v3.HeaderMap request_trailers = 4;

// Response headers.
config.core.v3.HeaderMap response_headers = 5;

// Response body chunk.
Body response_body_chunk = 6;

// Response trailers.
config.core.v3.HeaderMap response_trailers = 7;
}
}
543 changes: 543 additions & 0 deletions ...055ebf5e1a993e1f827f62a0aff2367a14eb11cc14a1ad85d44f34a4b7b6a38ad472d8c8d280e41f1c2ebe977
View file

Large diffs are not rendered by default.

260 changes: 260 additions & 0 deletions ...a4ad393c7fdb8d05056dda912fee08bf412db38d93348d23371fbc45c6f9d02c454563493a811b3979bdcabe5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
syntax = "proto3";

package envoy.extensions.load_balancing_policies.subset.v3;

import "envoy/config/cluster/v3/cluster.proto";

import "google/protobuf/struct.proto";

import "udpa/annotations/status.proto";
import "udpa/annotations/versioning.proto";
import "validate/validate.proto";

option java_package = "io.envoyproxy.envoy.extensions.load_balancing_policies.subset.v3";
option java_outer_classname = "SubsetProto";
option java_multiple_files = true;
option go_package = "github.com/envoyproxy/go-control-plane/envoy/extensions/load_balancing_policies/subset/v3;subsetv3";
option (udpa.annotations.file_status).package_version_status = ACTIVE;

// [#protodoc-title: Subset Load Balancing Policy]
// [#extension: envoy.load_balancing_policies.subset]

// Optionally divide the endpoints in this cluster into subsets defined by
// endpoint metadata and selected by route and weighted cluster metadata.
// [#next-free-field: 11]
message Subset {
option (udpa.annotations.versioning).previous_message_type =
"envoy.config.cluster.v3.LbSubsetConfig";

// If NO_FALLBACK is selected, a result
// equivalent to no healthy hosts is reported. If ANY_ENDPOINT is selected,
// any cluster endpoint may be returned (subject to policy, health checks,
// etc). If DEFAULT_SUBSET is selected, load balancing is performed over the
// endpoints matching the values from the default_subset field.
enum LbSubsetFallbackPolicy {
NO_FALLBACK = 0;
ANY_ENDPOINT = 1;
DEFAULT_SUBSET = 2;
}

enum LbSubsetMetadataFallbackPolicy {
// No fallback. Route metadata will be used as-is.
METADATA_NO_FALLBACK = 0;

// A special metadata key ``fallback_list`` will be used to provide variants of metadata to try.
// Value of ``fallback_list`` key has to be a list. Every list element has to be a struct - it will
// be merged with route metadata, overriding keys that appear in both places.
// ``fallback_list`` entries will be used in order until a host is found.
//
// ``fallback_list`` key itself is removed from metadata before subset load balancing is performed.
//
// Example:
//
// for metadata:
//
// .. code-block:: yaml
//
// version: 1.0
// fallback_list:
// - version: 2.0
// hardware: c64
// - hardware: c32
// - version: 3.0
//
// at first, metadata:
//
// .. code-block:: json
//
// {"version": "2.0", "hardware": "c64"}
//
// will be used for load balancing. If no host is found, metadata:
//
// .. code-block:: json
//
// {"version": "1.0", "hardware": "c32"}
//
// is next to try. If it still results in no host, finally metadata:
//
// .. code-block:: json
//
// {"version": "3.0"}
//
// is used.
FALLBACK_LIST = 1;
}

// Specifications for subsets.
message LbSubsetSelector {
// Allows to override top level fallback policy per selector.
enum LbSubsetSelectorFallbackPolicy {
// If NOT_DEFINED top level config fallback policy is used instead.
NOT_DEFINED = 0;

// If NO_FALLBACK is selected, a result equivalent to no healthy hosts is reported.
NO_FALLBACK = 1;

// If ANY_ENDPOINT is selected, any cluster endpoint may be returned
// (subject to policy, health checks, etc).
ANY_ENDPOINT = 2;

// If DEFAULT_SUBSET is selected, load balancing is performed over the
// endpoints matching the values from the default_subset field.
DEFAULT_SUBSET = 3;

// If KEYS_SUBSET is selected, subset selector matching is performed again with metadata
// keys reduced to
// :ref:`fallback_keys_subset<envoy_v3_api_field_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetSelector.fallback_keys_subset>`.
// It allows for a fallback to a different, less specific selector if some of the keys of
// the selector are considered optional.
KEYS_SUBSET = 4;
}

// List of keys to match with the weighted cluster metadata.
repeated string keys = 1;

// Selects a mode of operation in which each subset has only one host. This mode uses the same rules for
// choosing a host, but updating hosts is faster, especially for large numbers of hosts.
//
// If a match is found to a host, that host will be used regardless of priority levels.
//
// When this mode is enabled, configurations that contain more than one host with the same metadata value for the single key in ``keys``
// will use only one of the hosts with the given key; no requests will be routed to the others. The cluster gauge
// :ref:`lb_subsets_single_host_per_subset_duplicate<config_cluster_manager_cluster_stats_subset_lb>` indicates how many duplicates are
// present in the current configuration.
bool single_host_per_subset = 4;

// The behavior used when no endpoint subset matches the selected route's
// metadata.
LbSubsetSelectorFallbackPolicy fallback_policy = 2
[(validate.rules).enum = {defined_only: true}];

// Subset of
// :ref:`keys<envoy_v3_api_field_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetSelector.keys>` used by
// :ref:`KEYS_SUBSET<envoy_v3_api_enum_value_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetSelector.LbSubsetSelectorFallbackPolicy.KEYS_SUBSET>`
// fallback policy.
// It has to be a non empty list if KEYS_SUBSET fallback policy is selected.
// For any other fallback policy the parameter is not used and should not be set.
// Only values also present in
// :ref:`keys<envoy_v3_api_field_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetSelector.keys>` are allowed, but
// ``fallback_keys_subset`` cannot be equal to ``keys``.
repeated string fallback_keys_subset = 3;
}

// The behavior used when no endpoint subset matches the selected route's
// metadata. The value defaults to
// :ref:`NO_FALLBACK<envoy_v3_api_enum_value_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetFallbackPolicy.NO_FALLBACK>`.
LbSubsetFallbackPolicy fallback_policy = 1 [(validate.rules).enum = {defined_only: true}];

// Specifies the default subset of endpoints used during fallback if
// fallback_policy is
// :ref:`DEFAULT_SUBSET<envoy_v3_api_enum_value_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetFallbackPolicy.DEFAULT_SUBSET>`.
// Each field in default_subset is
// compared to the matching LbEndpoint.Metadata under the ``envoy.lb``
// namespace. It is valid for no hosts to match, in which case the behavior
// is the same as a fallback_policy of
// :ref:`NO_FALLBACK<envoy_v3_api_enum_value_extensions.load_balancing_policies.subset.v3.Subset.LbSubsetFallbackPolicy.NO_FALLBACK>`.
google.protobuf.Struct default_subset = 2;

// For each entry, LbEndpoint.Metadata's
// ``envoy.lb`` namespace is traversed and a subset is created for each unique
// combination of key and value. For example:
//
// .. code-block:: json
//
// { "subset_selectors": [
// { "keys": [ "version" ] },
// { "keys": [ "stage", "hardware_type" ] }
// ]}
//
// A subset is matched when the metadata from the selected route and
// weighted cluster contains the same keys and values as the subset's
// metadata. The same host may appear in multiple subsets.
repeated LbSubsetSelector subset_selectors = 3;

// By default, only when the request metadata has exactly the **same** keys as one of subset selectors and
// the values of the related keys are matched, the load balancer will have a valid subset for the request.
// For example, given the following subset selectors:
//
// .. code-block:: json
//
// { "subset_selectors": [
// { "keys": [ "version" ] },
// { "keys": [ "stage", "version" ] }
// ]}
//
// A request with metadata ``{"redundant-key": "redundant-value", "stage": "prod", "version": "v1"}`` or
// ``{"redundant-key": "redundant-value", "version": "v1"}`` will not have a valid subset even if the values
// of keys ``stage`` and ``version`` are matched because of the redundant key/value pair in the request
// metadata.
//
// By setting this field to true, the most appropriate keys will be filtered out from the request metadata
// according to the subset selectors. And then the filtered keys and related values will be matched to find
// the valid host subset. By this way, redundant key/value pairs are allowed in the request metadata. The keys
// of a request metadata could be superset of the keys of the subset selectors and need not to be exactly the
// same as the keys of the subset selectors.
//
// More specifically, if the keys of a request metadata is a superset of one of the subset selectors, then only
// the values of the keys that in the selector keys will be matched. Take the above example, if the request
// metadata is ``{"redundant-key": "redundant-value", "stage": "prod", "version": "v1"}``, the load balancer
// will only match the values of ``stage`` and ``version`` to find an appropriate subset because ``stage``
// ``version`` are contained by the second subset selector and the redundant ``redundant-key`` will be
// ignored.
//
// .. note::
// If the keys of request metadata is superset of multiple different subset selectors keys, the subset
// selector with most keys to win. For example, given subset selectors
// ``{"subset_selectors": ["keys": ["A", "B", "C"], ["A", "B"]]}`` and request metadata ``{"A": "-",
// "B": "-", "C": "-", "D": "-"}``, keys ``A``, ``B``, ``C`` will be evaluated.
// If the keys of request metadata is superset of multiple different subset selectors keys and the number
// of selector keys are same, then the one placed in front to win. For example, given subset selectors
// ``{"subset_selectors": ["keys": ["A", "B"], ["C", "D"]]}`` and request metadata ``{"A": "-", "B": "-",
// "C": "-", "D": "-"}``, keys ``A``, ``B`` will be evaluated.
//
bool allow_redundant_keys = 10;

// If true, routing to subsets will take into account the localities and locality weights of the
// endpoints when making the routing decision.
//
// There are some potential pitfalls associated with enabling this feature, as the resulting
// traffic split after applying both a subset match and locality weights might be undesirable.
//
// Consider for example a situation in which you have 50/50 split across two localities X/Y
// which have 100 hosts each without subsetting. If the subset LB results in X having only 1
// host selected but Y having 100, then a lot more load is being dumped on the single host in X
// than originally anticipated in the load balancing assignment delivered via EDS.
bool locality_weight_aware = 4;

// When used with locality_weight_aware, scales the weight of each locality by the ratio
// of hosts in the subset vs hosts in the original subset. This aims to even out the load
// going to an individual locality if said locality is disproportionately affected by the
// subset predicate.
bool scale_locality_weight = 5;

// If true, when a fallback policy is configured and its corresponding subset fails to find
// a host this will cause any host to be selected instead.
//
// This is useful when using the default subset as the fallback policy, given the default
// subset might become empty. With this option enabled, if that happens the LB will attempt
// to select a host from the entire cluster.
bool panic_mode_any = 6;

// If true, metadata specified for a metadata key will be matched against the corresponding
// endpoint metadata if the endpoint metadata matches the value exactly OR it is a list value
// and any of the elements in the list matches the criteria.
bool list_as_any = 7;

// Fallback mechanism that allows to try different route metadata until a host is found.
// If load balancing process, including all its mechanisms (like
// :ref:`fallback_policy<envoy_v3_api_field_extensions.load_balancing_policies.subset.v3.subset.fallback_policy>`)
// fails to select a host, this policy decides if and how the process is repeated using another metadata.
//
// The value defaults to
// :ref:`METADATA_NO_FALLBACK
// <envoy_v3_api_enum_value_extensions.load_balancing_policies.subset.v3.subset.LbSubsetMetadataFallbackPolicy.METADATA_NO_FALLBACK>`.
LbSubsetMetadataFallbackPolicy metadata_fallback_policy = 8
[(validate.rules).enum = {defined_only: true}];

// The child LB policy to create for endpoint-picking within the chosen subset.
config.cluster.v3.LoadBalancingPolicy subset_lb_policy = 9
[(validate.rules).message = {required: true}];
}
Loading

0 comments on commit 202cf16

Please sign in to comment.