Sync APIs. @tag-name=gloo-sah

api/gloo/enterprise.gloo/v1/auth_config.proto

@@ -1631,7 +1631,6 @@ message PortalAuth {
     google.protobuf.Duration request_timeout = 5;
 }
 
-
 message AuthConfigStatus {
 	enum State {
 			// Pending status indicates the resource has not yet been validated

api/gloo/gloo/external/envoy/config/trace/v3/opentelemetry.proto

@@ -31,23 +31,6 @@ message OpenTelemetryConfig {
     // OpenTelemetry agent
     string cluster_name = 2;
   }
-
-  // Optional. If set, the service name will be used as the service name in the trace.
-  // If this is not set it will be automatically set to the name of the 
-  // listener + the namespace of the Gateway object
-  string service_name = 3;
-
-  // Optional. Current only gRPC is supported, but are intentionally using a oneof
-  // to allow for future support of HTTP. This structure matches Envoy's.
-  oneof service_type {
-    // Optional gRPC transport options
-    GrpcService grpc_service = 4;
-  }
-}
-
-message GrpcService {
-  // Set the authority header when calling the gRPC service.
-  string authority = 1;
 }
 
 option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/external/envoy/config/trace/v3";

api/gloo/gloo/v1/circuit_breaker/circuit_breaker.proto → api/gloo/gloo/v1/circuit_breaker.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 package gloo.solo.io;
-option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1/circuit_breaker";
+option go_package = "github.com/solo-io/solo-apis/pkg/api/gloo.solo.io/v1";
 
 import "google/protobuf/wrappers.proto";
 import "extproto/ext.proto";
@@ -17,5 +17,4 @@ message CircuitBreakerConfig {
     google.protobuf.UInt32Value max_pending_requests = 2;
     google.protobuf.UInt32Value max_requests = 3;
     google.protobuf.UInt32Value max_retries = 4;
-    bool track_remaining = 5;
 }

api/gloo/gloo/v1/options/als/als.proto

@@ -63,10 +63,6 @@ message GrpcService {
     repeated string additional_response_headers_to_log = 5;
 
     repeated string additional_response_trailers_to_log = 6;
-
-    // Additional filter state objects to log in filter_state_objects. Logger will call FilterState::Object::serializeAsProto to serialize the filter state object.
-    // See https://www.envoyproxy.io/docs/envoy/latest/api-v3/extensions/access_loggers/grpc/v3/als.proto#extensions-access-loggers-grpc-v3-commongrpcaccesslogconfig
-    repeated string filter_state_objects_to_log = 7;
 }
 
 message AccessLogFilter {

api/gloo/gloo/v1/options/dynamic_forward_proxy/dynamic_forward_proxy.proto

@@ -13,7 +13,6 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/wrappers.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/config/core/v3/address.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/ssl/ssl.proto";
-import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker/circuit_breaker.proto";
 
 // Configuration for the dynamic forward proxy HTTP filter. See the :ref:`architecture overview
 // <arch_overview_http_dynamic_forward_proxy>` for more information.
@@ -32,11 +31,6 @@ message FilterConfig {
 
   // If provided, the autogenerated dynamic forward proxy cluster will use TLS when connecting to upstream hosts and verify the certificate chain
   .gloo.solo.io.UpstreamSslConfig ssl_config = 3;
-
-  // Circuit breakers for this proxy. if not set, the defaults ones from the Gloo settings will be used.
-  // if those are not set, [envoy's defaults](https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/cluster/v3/circuit_breaker.proto#envoy-api-msg-cluster-circuitbreakers)
-  // will be used.
-  .gloo.solo.io.CircuitBreakerConfig circuit_breakers = 4;
 }
 
 // Configuration of circuit breakers for resolver.

api/gloo/gloo/v1/settings.proto

@@ -17,7 +17,7 @@ import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/caching
 import "github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/extproc/extproc.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/enterprise/options/rbac/rbac.proto";
-import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker/circuit_breaker.proto";
+import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/ssl/ssl.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/extensions/aws/filter.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/options/consul/query_options.proto";

api/gloo/gloo/v1/upstream.proto

@@ -10,7 +10,7 @@ option (extproto.hash_all) = true;
 option (extproto.clone_all) = true;
 
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/ssl/ssl.proto";
-import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker/circuit_breaker.proto";
+import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/circuit_breaker.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/load_balancer.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/v1/connection.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gloo/external/envoy/api/v2/core/health_check.proto";