diff --git a/BUILD b/BUILD index 341cc48a..d8cffd4a 100644 --- a/BUILD +++ b/BUILD @@ -97,10 +97,10 @@ proto_library( "//envoy/data/tap/v3:pkg", "//envoy/extensions/access_loggers/file/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", - "//envoy/extensions/access_loggers/open_telemetry/v3alpha:pkg", + "//envoy/extensions/access_loggers/open_telemetry/v3:pkg", "//envoy/extensions/access_loggers/stream/v3:pkg", "//envoy/extensions/access_loggers/wasm/v3:pkg", - "//envoy/extensions/cache/simple_http_cache/v3alpha:pkg", + "//envoy/extensions/cache/simple_http_cache/v3:pkg", "//envoy/extensions/clusters/aggregate/v3:pkg", "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg", "//envoy/extensions/clusters/redis/v3:pkg", @@ -116,14 +116,14 @@ proto_library( "//envoy/extensions/filters/common/fault/v3:pkg", "//envoy/extensions/filters/common/matcher/action/v3:pkg", "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg", - "//envoy/extensions/filters/http/admission_control/v3alpha:pkg", + "//envoy/extensions/filters/http/admission_control/v3:pkg", "//envoy/extensions/filters/http/alternate_protocols_cache/v3:pkg", "//envoy/extensions/filters/http/aws_lambda/v3:pkg", "//envoy/extensions/filters/http/aws_request_signing/v3:pkg", - "//envoy/extensions/filters/http/bandwidth_limit/v3alpha:pkg", + "//envoy/extensions/filters/http/bandwidth_limit/v3:pkg", "//envoy/extensions/filters/http/buffer/v3:pkg", - "//envoy/extensions/filters/http/cache/v3alpha:pkg", - "//envoy/extensions/filters/http/cdn_loop/v3alpha:pkg", + "//envoy/extensions/filters/http/cache/v3:pkg", + "//envoy/extensions/filters/http/cdn_loop/v3:pkg", "//envoy/extensions/filters/http/composite/v3:pkg", "//envoy/extensions/filters/http/compressor/v3:pkg", "//envoy/extensions/filters/http/cors/v3:pkg", @@ -132,7 +132,7 @@ proto_library( "//envoy/extensions/filters/http/dynamic_forward_proxy/v3:pkg", "//envoy/extensions/filters/http/dynamo/v3:pkg", "//envoy/extensions/filters/http/ext_authz/v3:pkg", - "//envoy/extensions/filters/http/ext_proc/v3alpha:pkg", + "//envoy/extensions/filters/http/ext_proc/v3:pkg", "//envoy/extensions/filters/http/fault/v3:pkg", "//envoy/extensions/filters/http/grpc_http1_bridge/v3:pkg", "//envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3:pkg", @@ -147,7 +147,7 @@ proto_library( "//envoy/extensions/filters/http/kill_request/v3:pkg", "//envoy/extensions/filters/http/local_ratelimit/v3:pkg", "//envoy/extensions/filters/http/lua/v3:pkg", - "//envoy/extensions/filters/http/oauth2/v3alpha:pkg", + "//envoy/extensions/filters/http/oauth2/v3:pkg", "//envoy/extensions/filters/http/on_demand/v3:pkg", "//envoy/extensions/filters/http/original_src/v3:pkg", "//envoy/extensions/filters/http/ratelimit/v3:pkg", @@ -175,14 +175,14 @@ proto_library( "//envoy/extensions/filters/network/rbac/v3:pkg", "//envoy/extensions/filters/network/redis_proxy/v3:pkg", "//envoy/extensions/filters/network/sni_cluster/v3:pkg", - "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", + "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3:pkg", "//envoy/extensions/filters/network/tcp_proxy/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/router/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/v3:pkg", "//envoy/extensions/filters/network/wasm/v3:pkg", "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", - "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", + "//envoy/extensions/filters/udp/dns_filter/v3:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", "//envoy/extensions/formatter/metadata/v3:pkg", "//envoy/extensions/formatter/req_without_query/v3:pkg", @@ -215,7 +215,7 @@ proto_library( "//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg", "//envoy/extensions/transport_sockets/quic/v3:pkg", "//envoy/extensions/transport_sockets/raw_buffer/v3:pkg", - "//envoy/extensions/transport_sockets/s2a/v3alpha:pkg", + "//envoy/extensions/transport_sockets/s2a/v3:pkg", "//envoy/extensions/transport_sockets/starttls/v3:pkg", "//envoy/extensions/transport_sockets/tap/v3:pkg", "//envoy/extensions/transport_sockets/tls/v3:pkg", @@ -225,14 +225,14 @@ proto_library( "//envoy/extensions/upstreams/http/v3:pkg", "//envoy/extensions/upstreams/tcp/generic/v3:pkg", "//envoy/extensions/wasm/v3:pkg", - "//envoy/extensions/watchdog/profile_action/v3alpha:pkg", + "//envoy/extensions/watchdog/profile_action/v3:pkg", "//envoy/service/accesslog/v3:pkg", "//envoy/service/auth/v3:pkg", "//envoy/service/cluster/v3:pkg", "//envoy/service/discovery/v3:pkg", "//envoy/service/endpoint/v3:pkg", "//envoy/service/event_reporting/v3:pkg", - "//envoy/service/ext_proc/v3alpha:pkg", + "//envoy/service/ext_proc/v3:pkg", "//envoy/service/extension/v3:pkg", "//envoy/service/health/v3:pkg", "//envoy/service/listener/v3:pkg", @@ -250,7 +250,7 @@ proto_library( "//envoy/type/metadata/v3:pkg", "//envoy/type/tracing/v3:pkg", "//envoy/type/v3:pkg", - "//envoy/watchdog/v3alpha:pkg", + "//envoy/watchdog/v3:pkg", ], ) diff --git a/envoy/extensions/access_loggers/open_telemetry/v3alpha/BUILD b/envoy/extensions/access_loggers/open_telemetry/v3/BUILD similarity index 100% rename from envoy/extensions/access_loggers/open_telemetry/v3alpha/BUILD rename to envoy/extensions/access_loggers/open_telemetry/v3/BUILD diff --git a/envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.proto b/envoy/extensions/access_loggers/open_telemetry/v3/logs_service.proto similarity index 93% rename from envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.proto rename to envoy/extensions/access_loggers/open_telemetry/v3/logs_service.proto index 1b702713..cd4a6318 100644 --- a/envoy/extensions/access_loggers/open_telemetry/v3alpha/logs_service.proto +++ b/envoy/extensions/access_loggers/open_telemetry/v3/logs_service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.access_loggers.open_telemetry.v3alpha; +package envoy.extensions.access_loggers.open_telemetry.v3; import "envoy/extensions/access_loggers/grpc/v3/als.proto"; @@ -9,10 +9,9 @@ import "opentelemetry/proto/common/v1/common.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.access_loggers.open_telemetry.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.access_loggers.open_telemetry.v3"; option java_outer_classname = "LogsServiceProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: OpenTelemetry (gRPC) Access Log] diff --git a/envoy/extensions/cache/simple_http_cache/v3alpha/BUILD b/envoy/extensions/cache/simple_http_cache/v3/BUILD similarity index 100% rename from envoy/extensions/cache/simple_http_cache/v3alpha/BUILD rename to envoy/extensions/cache/simple_http_cache/v3/BUILD diff --git a/envoy/extensions/cache/simple_http_cache/v3alpha/config.proto b/envoy/extensions/cache/simple_http_cache/v3/config.proto similarity index 83% rename from envoy/extensions/cache/simple_http_cache/v3alpha/config.proto rename to envoy/extensions/cache/simple_http_cache/v3/config.proto index 1b42e9b3..e7bd7cdb 100644 --- a/envoy/extensions/cache/simple_http_cache/v3alpha/config.proto +++ b/envoy/extensions/cache/simple_http_cache/v3/config.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package envoy.extensions.cache.simple_http_cache.v3alpha; +package envoy.extensions.cache.simple_http_cache.v3; import "udpa/annotations/status.proto"; -option java_package = "io.envoyproxy.envoy.extensions.cache.simple_http_cache.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.cache.simple_http_cache.v3"; option java_outer_classname = "ConfigProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; diff --git a/envoy/extensions/filters/http/admission_control/v3alpha/BUILD b/envoy/extensions/filters/http/admission_control/v3/BUILD similarity index 100% rename from envoy/extensions/filters/http/admission_control/v3alpha/BUILD rename to envoy/extensions/filters/http/admission_control/v3/BUILD diff --git a/envoy/extensions/filters/http/admission_control/v3alpha/admission_control.proto b/envoy/extensions/filters/http/admission_control/v3/admission_control.proto similarity index 96% rename from envoy/extensions/filters/http/admission_control/v3alpha/admission_control.proto rename to envoy/extensions/filters/http/admission_control/v3/admission_control.proto index 9bb3603f..702f0301 100644 --- a/envoy/extensions/filters/http/admission_control/v3alpha/admission_control.proto +++ b/envoy/extensions/filters/http/admission_control/v3/admission_control.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.http.admission_control.v3alpha; +package envoy.extensions.filters.http.admission_control.v3; import "envoy/config/core/v3/base.proto"; import "envoy/type/v3/range.proto"; @@ -10,10 +10,9 @@ import "google/protobuf/duration.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.admission_control.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.admission_control.v3"; option java_outer_classname = "AdmissionControlProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Admission Control] diff --git a/envoy/extensions/filters/http/bandwidth_limit/v3alpha/BUILD b/envoy/extensions/filters/http/bandwidth_limit/v3/BUILD similarity index 100% rename from envoy/extensions/filters/http/bandwidth_limit/v3alpha/BUILD rename to envoy/extensions/filters/http/bandwidth_limit/v3/BUILD diff --git a/envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.proto b/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.proto similarity index 93% rename from envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.proto rename to envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.proto index 4cd5f826..c512d541 100644 --- a/envoy/extensions/filters/http/bandwidth_limit/v3alpha/bandwidth_limit.proto +++ b/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.http.bandwidth_limit.v3alpha; +package envoy.extensions.filters.http.bandwidth_limit.v3; import "envoy/config/core/v3/base.proto"; @@ -10,10 +10,9 @@ import "google/protobuf/wrappers.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.bandwidth_limit.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.bandwidth_limit.v3"; option java_outer_classname = "BandwidthLimitProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Bandwidth limit] diff --git a/envoy/extensions/filters/http/cache/v3alpha/BUILD b/envoy/extensions/filters/http/cache/v3/BUILD similarity index 100% rename from envoy/extensions/filters/http/cache/v3alpha/BUILD rename to envoy/extensions/filters/http/cache/v3/BUILD diff --git a/envoy/extensions/filters/http/cache/v3alpha/cache.proto b/envoy/extensions/filters/http/cache/v3/cache.proto similarity index 96% rename from envoy/extensions/filters/http/cache/v3alpha/cache.proto rename to envoy/extensions/filters/http/cache/v3/cache.proto index 5f0a5bef..71f4a5bb 100644 --- a/envoy/extensions/filters/http/cache/v3alpha/cache.proto +++ b/envoy/extensions/filters/http/cache/v3/cache.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.http.cache.v3alpha; +package envoy.extensions.filters.http.cache.v3; import "envoy/config/route/v3/route_components.proto"; import "envoy/type/matcher/v3/string.proto"; @@ -11,10 +11,9 @@ import "udpa/annotations/status.proto"; import "udpa/annotations/versioning.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.cache.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.cache.v3"; option java_outer_classname = "CacheProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: HTTP Cache Filter] diff --git a/envoy/extensions/filters/http/cdn_loop/v3alpha/BUILD b/envoy/extensions/filters/http/cdn_loop/v3/BUILD similarity index 100% rename from envoy/extensions/filters/http/cdn_loop/v3alpha/BUILD rename to envoy/extensions/filters/http/cdn_loop/v3/BUILD diff --git a/envoy/extensions/filters/http/cdn_loop/v3alpha/cdn_loop.proto b/envoy/extensions/filters/http/cdn_loop/v3/cdn_loop.proto similarity index 89% rename from envoy/extensions/filters/http/cdn_loop/v3alpha/cdn_loop.proto rename to envoy/extensions/filters/http/cdn_loop/v3/cdn_loop.proto index 5f201026..77a19511 100644 --- a/envoy/extensions/filters/http/cdn_loop/v3alpha/cdn_loop.proto +++ b/envoy/extensions/filters/http/cdn_loop/v3/cdn_loop.proto @@ -1,14 +1,13 @@ syntax = "proto3"; -package envoy.extensions.filters.http.cdn_loop.v3alpha; +package envoy.extensions.filters.http.cdn_loop.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.cdn_loop.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.cdn_loop.v3"; option java_outer_classname = "CdnLoopProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: HTTP CDN-Loop Filter] diff --git a/envoy/extensions/filters/http/ext_proc/v3alpha/BUILD b/envoy/extensions/filters/http/ext_proc/v3/BUILD similarity index 84% rename from envoy/extensions/filters/http/ext_proc/v3alpha/BUILD rename to envoy/extensions/filters/http/ext_proc/v3/BUILD index 1c1a6f6b..e9b556d6 100644 --- a/envoy/extensions/filters/http/ext_proc/v3alpha/BUILD +++ b/envoy/extensions/filters/http/ext_proc/v3/BUILD @@ -8,5 +8,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", + "@com_github_cncf_udpa//xds/annotations/v3:pkg", ], ) diff --git a/envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.proto b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.proto similarity index 96% rename from envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.proto rename to envoy/extensions/filters/http/ext_proc/v3/ext_proc.proto index 37560feb..e6886578 100644 --- a/envoy/extensions/filters/http/ext_proc/v3alpha/ext_proc.proto +++ b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.proto @@ -1,20 +1,22 @@ syntax = "proto3"; -package envoy.extensions.filters.http.ext_proc.v3alpha; +package envoy.extensions.filters.http.ext_proc.v3; import "envoy/config/core/v3/grpc_service.proto"; -import "envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto"; +import "envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto"; import "google/protobuf/duration.proto"; +import "xds/annotations/v3/status.proto"; + import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3"; option java_outer_classname = "ExtProcProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (xds.annotations.v3.file_status).work_in_progress = true; // [#protodoc-title: External Processing Filter] // External Processing Filter @@ -88,9 +90,9 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; // // The protocol itself is based on a bidirectional gRPC stream. Envoy will send the // server -// :ref:`ProcessingRequest ` +// :ref:`ProcessingRequest ` // messages, and the server must reply with -// :ref:`ProcessingResponse `. +// :ref:`ProcessingResponse `. // [#next-free-field: 9] message ExternalProcessor { diff --git a/envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto b/envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto similarity index 93% rename from envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto rename to envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto index d085790d..c15a5569 100644 --- a/envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto +++ b/envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto @@ -1,15 +1,17 @@ syntax = "proto3"; -package envoy.extensions.filters.http.ext_proc.v3alpha; +package envoy.extensions.filters.http.ext_proc.v3; + +import "xds/annotations/v3/status.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.ext_proc.v3"; option java_outer_classname = "ProcessingModeProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (xds.annotations.v3.file_status).work_in_progress = true; // [#protodoc-title: External Processing Filter] // External Processing Filter Processing Mode diff --git a/envoy/extensions/filters/http/oauth2/v3alpha/BUILD b/envoy/extensions/filters/http/oauth2/v3/BUILD similarity index 100% rename from envoy/extensions/filters/http/oauth2/v3alpha/BUILD rename to envoy/extensions/filters/http/oauth2/v3/BUILD diff --git a/envoy/extensions/filters/http/oauth2/v3alpha/oauth.proto b/envoy/extensions/filters/http/oauth2/v3/oauth.proto similarity index 96% rename from envoy/extensions/filters/http/oauth2/v3alpha/oauth.proto rename to envoy/extensions/filters/http/oauth2/v3/oauth.proto index e5f99051..e8845545 100644 --- a/envoy/extensions/filters/http/oauth2/v3alpha/oauth.proto +++ b/envoy/extensions/filters/http/oauth2/v3/oauth.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.http.oauth2.v3alpha; +package envoy.extensions.filters.http.oauth2.v3; import "envoy/config/core/v3/http_uri.proto"; import "envoy/config/route/v3/route_components.proto"; @@ -10,10 +10,9 @@ import "envoy/type/matcher/v3/path.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.http.oauth2.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.http.oauth2.v3"; option java_outer_classname = "OauthProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: OAuth] diff --git a/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/BUILD b/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/BUILD similarity index 100% rename from envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/BUILD rename to envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/BUILD diff --git a/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.proto b/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.proto similarity index 92% rename from envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.proto rename to envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.proto index 7f7eb57d..a084b068 100644 --- a/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha/sni_dynamic_forward_proxy.proto +++ b/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.proto @@ -1,16 +1,15 @@ syntax = "proto3"; -package envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha; +package envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3; import "envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.network.sni_dynamic_forward_proxy.v3"; option java_outer_classname = "SniDynamicForwardProxyProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: SNI dynamic forward proxy] diff --git a/envoy/extensions/filters/udp/dns_filter/v3alpha/BUILD b/envoy/extensions/filters/udp/dns_filter/v3/BUILD similarity index 100% rename from envoy/extensions/filters/udp/dns_filter/v3alpha/BUILD rename to envoy/extensions/filters/udp/dns_filter/v3/BUILD diff --git a/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto b/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.proto similarity index 96% rename from envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto rename to envoy/extensions/filters/udp/dns_filter/v3/dns_filter.proto index 39f44724..63542bda 100644 --- a/envoy/extensions/filters/udp/dns_filter/v3alpha/dns_filter.proto +++ b/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package envoy.extensions.filters.udp.dns_filter.v3alpha; +package envoy.extensions.filters.udp.dns_filter.v3; import "envoy/config/core/v3/address.proto"; import "envoy/config/core/v3/base.proto"; @@ -13,10 +13,9 @@ import "envoy/annotations/deprecation.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.filters.udp.dns_filter.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.filters.udp.dns_filter.v3"; option java_outer_classname = "DnsFilterProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: DNS Filter] diff --git a/envoy/extensions/transport_sockets/s2a/v3alpha/BUILD b/envoy/extensions/transport_sockets/s2a/v3/BUILD similarity index 100% rename from envoy/extensions/transport_sockets/s2a/v3alpha/BUILD rename to envoy/extensions/transport_sockets/s2a/v3/BUILD diff --git a/envoy/extensions/transport_sockets/s2a/v3alpha/s2a.proto b/envoy/extensions/transport_sockets/s2a/v3/s2a.proto similarity index 83% rename from envoy/extensions/transport_sockets/s2a/v3alpha/s2a.proto rename to envoy/extensions/transport_sockets/s2a/v3/s2a.proto index b32b8465..7c77222f 100644 --- a/envoy/extensions/transport_sockets/s2a/v3alpha/s2a.proto +++ b/envoy/extensions/transport_sockets/s2a/v3/s2a.proto @@ -1,14 +1,13 @@ syntax = "proto3"; -package envoy.extensions.transport_sockets.s2a.v3alpha; +package envoy.extensions.transport_sockets.s2a.v3; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.transport_sockets.s2a.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.transport_sockets.s2a.v3"; option java_outer_classname = "S2aProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#not-implemented-hide:] diff --git a/envoy/extensions/watchdog/profile_action/v3alpha/BUILD b/envoy/extensions/watchdog/profile_action/v3/BUILD similarity index 100% rename from envoy/extensions/watchdog/profile_action/v3alpha/BUILD rename to envoy/extensions/watchdog/profile_action/v3/BUILD diff --git a/envoy/extensions/watchdog/profile_action/v3alpha/profile_action.proto b/envoy/extensions/watchdog/profile_action/v3/profile_action.proto similarity index 87% rename from envoy/extensions/watchdog/profile_action/v3alpha/profile_action.proto rename to envoy/extensions/watchdog/profile_action/v3/profile_action.proto index d73f0b5d..07c3907f 100644 --- a/envoy/extensions/watchdog/profile_action/v3alpha/profile_action.proto +++ b/envoy/extensions/watchdog/profile_action/v3/profile_action.proto @@ -1,16 +1,15 @@ syntax = "proto3"; -package envoy.extensions.watchdog.profile_action.v3alpha; +package envoy.extensions.watchdog.profile_action.v3; import "google/protobuf/duration.proto"; import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.extensions.watchdog.profile_action.v3alpha"; +option java_package = "io.envoyproxy.envoy.extensions.watchdog.profile_action.v3"; option java_outer_classname = "ProfileActionProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Watchdog Action that does CPU profiling.] diff --git a/envoy/service/ext_proc/v3alpha/BUILD b/envoy/service/ext_proc/v3/BUILD similarity index 76% rename from envoy/service/ext_proc/v3alpha/BUILD rename to envoy/service/ext_proc/v3/BUILD index 4f3730e2..d4506b16 100644 --- a/envoy/service/ext_proc/v3alpha/BUILD +++ b/envoy/service/ext_proc/v3/BUILD @@ -8,8 +8,9 @@ api_proto_package( has_services = True, deps = [ "//envoy/config/core/v3:pkg", - "//envoy/extensions/filters/http/ext_proc/v3alpha:pkg", + "//envoy/extensions/filters/http/ext_proc/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", + "@com_github_cncf_udpa//xds/annotations/v3:pkg", ], ) diff --git a/envoy/service/ext_proc/v3alpha/external_processor.proto b/envoy/service/ext_proc/v3/external_processor.proto similarity index 97% rename from envoy/service/ext_proc/v3alpha/external_processor.proto rename to envoy/service/ext_proc/v3/external_processor.proto index 09572331..dc6b527d 100644 --- a/envoy/service/ext_proc/v3alpha/external_processor.proto +++ b/envoy/service/ext_proc/v3/external_processor.proto @@ -1,22 +1,24 @@ syntax = "proto3"; -package envoy.service.ext_proc.v3alpha; +package envoy.service.ext_proc.v3; import "envoy/config/core/v3/base.proto"; -import "envoy/extensions/filters/http/ext_proc/v3alpha/processing_mode.proto"; +import "envoy/extensions/filters/http/ext_proc/v3/processing_mode.proto"; import "envoy/type/v3/http_status.proto"; import "google/protobuf/struct.proto"; +import "xds/annotations/v3/status.proto"; + import "udpa/annotations/status.proto"; import "validate/validate.proto"; -option java_package = "io.envoyproxy.envoy.service.ext_proc.v3alpha"; +option java_package = "io.envoyproxy.envoy.service.ext_proc.v3"; option java_outer_classname = "ExternalProcessorProto"; option java_multiple_files = true; option java_generic_services = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; +option (xds.annotations.v3.file_status).work_in_progress = true; // [#protodoc-title: External Processing Service] @@ -167,7 +169,7 @@ message ProcessingResponse { // for the duration of this particular request/response only. Servers // may use this to intelligently control how requests are processed // based on the headers and other metadata that they see. - envoy.extensions.filters.http.ext_proc.v3alpha.ProcessingMode mode_override = 9; + envoy.extensions.filters.http.ext_proc.v3.ProcessingMode mode_override = 9; } // The following are messages that are sent to the server. diff --git a/envoy/watchdog/v3alpha/BUILD b/envoy/watchdog/v3/BUILD similarity index 100% rename from envoy/watchdog/v3alpha/BUILD rename to envoy/watchdog/v3/BUILD diff --git a/envoy/watchdog/v3alpha/README.md b/envoy/watchdog/v3/README.md similarity index 100% rename from envoy/watchdog/v3alpha/README.md rename to envoy/watchdog/v3/README.md diff --git a/envoy/watchdog/v3alpha/abort_action.proto b/envoy/watchdog/v3/abort_action.proto similarity index 85% rename from envoy/watchdog/v3alpha/abort_action.proto rename to envoy/watchdog/v3/abort_action.proto index d6f34aa8..325c3d3d 100644 --- a/envoy/watchdog/v3alpha/abort_action.proto +++ b/envoy/watchdog/v3/abort_action.proto @@ -1,15 +1,14 @@ syntax = "proto3"; -package envoy.watchdog.v3alpha; +package envoy.watchdog.v3; import "google/protobuf/duration.proto"; import "udpa/annotations/status.proto"; -option java_package = "io.envoyproxy.envoy.watchdog.v3alpha"; +option java_package = "io.envoyproxy.envoy.watchdog.v3"; option java_outer_classname = "AbortActionProto"; option java_multiple_files = true; -option (udpa.annotations.file_status).work_in_progress = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Watchdog Action that kills a stuck thread to kill the process.] diff --git a/versioning/BUILD b/versioning/BUILD index bf34f6f1..8febd11d 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -49,10 +49,10 @@ proto_library( "//envoy/data/tap/v3:pkg", "//envoy/extensions/access_loggers/file/v3:pkg", "//envoy/extensions/access_loggers/grpc/v3:pkg", - "//envoy/extensions/access_loggers/open_telemetry/v3alpha:pkg", + "//envoy/extensions/access_loggers/open_telemetry/v3:pkg", "//envoy/extensions/access_loggers/stream/v3:pkg", "//envoy/extensions/access_loggers/wasm/v3:pkg", - "//envoy/extensions/cache/simple_http_cache/v3alpha:pkg", + "//envoy/extensions/cache/simple_http_cache/v3:pkg", "//envoy/extensions/clusters/aggregate/v3:pkg", "//envoy/extensions/clusters/dynamic_forward_proxy/v3:pkg", "//envoy/extensions/clusters/redis/v3:pkg", @@ -68,14 +68,14 @@ proto_library( "//envoy/extensions/filters/common/fault/v3:pkg", "//envoy/extensions/filters/common/matcher/action/v3:pkg", "//envoy/extensions/filters/http/adaptive_concurrency/v3:pkg", - "//envoy/extensions/filters/http/admission_control/v3alpha:pkg", + "//envoy/extensions/filters/http/admission_control/v3:pkg", "//envoy/extensions/filters/http/alternate_protocols_cache/v3:pkg", "//envoy/extensions/filters/http/aws_lambda/v3:pkg", "//envoy/extensions/filters/http/aws_request_signing/v3:pkg", - "//envoy/extensions/filters/http/bandwidth_limit/v3alpha:pkg", + "//envoy/extensions/filters/http/bandwidth_limit/v3:pkg", "//envoy/extensions/filters/http/buffer/v3:pkg", - "//envoy/extensions/filters/http/cache/v3alpha:pkg", - "//envoy/extensions/filters/http/cdn_loop/v3alpha:pkg", + "//envoy/extensions/filters/http/cache/v3:pkg", + "//envoy/extensions/filters/http/cdn_loop/v3:pkg", "//envoy/extensions/filters/http/composite/v3:pkg", "//envoy/extensions/filters/http/compressor/v3:pkg", "//envoy/extensions/filters/http/cors/v3:pkg", @@ -84,7 +84,7 @@ proto_library( "//envoy/extensions/filters/http/dynamic_forward_proxy/v3:pkg", "//envoy/extensions/filters/http/dynamo/v3:pkg", "//envoy/extensions/filters/http/ext_authz/v3:pkg", - "//envoy/extensions/filters/http/ext_proc/v3alpha:pkg", + "//envoy/extensions/filters/http/ext_proc/v3:pkg", "//envoy/extensions/filters/http/fault/v3:pkg", "//envoy/extensions/filters/http/grpc_http1_bridge/v3:pkg", "//envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3:pkg", @@ -99,7 +99,7 @@ proto_library( "//envoy/extensions/filters/http/kill_request/v3:pkg", "//envoy/extensions/filters/http/local_ratelimit/v3:pkg", "//envoy/extensions/filters/http/lua/v3:pkg", - "//envoy/extensions/filters/http/oauth2/v3alpha:pkg", + "//envoy/extensions/filters/http/oauth2/v3:pkg", "//envoy/extensions/filters/http/on_demand/v3:pkg", "//envoy/extensions/filters/http/original_src/v3:pkg", "//envoy/extensions/filters/http/ratelimit/v3:pkg", @@ -127,14 +127,14 @@ proto_library( "//envoy/extensions/filters/network/rbac/v3:pkg", "//envoy/extensions/filters/network/redis_proxy/v3:pkg", "//envoy/extensions/filters/network/sni_cluster/v3:pkg", - "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha:pkg", + "//envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3:pkg", "//envoy/extensions/filters/network/tcp_proxy/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/router/v3:pkg", "//envoy/extensions/filters/network/thrift_proxy/v3:pkg", "//envoy/extensions/filters/network/wasm/v3:pkg", "//envoy/extensions/filters/network/zookeeper_proxy/v3:pkg", - "//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg", + "//envoy/extensions/filters/udp/dns_filter/v3:pkg", "//envoy/extensions/filters/udp/udp_proxy/v3:pkg", "//envoy/extensions/formatter/metadata/v3:pkg", "//envoy/extensions/formatter/req_without_query/v3:pkg", @@ -167,7 +167,7 @@ proto_library( "//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg", "//envoy/extensions/transport_sockets/quic/v3:pkg", "//envoy/extensions/transport_sockets/raw_buffer/v3:pkg", - "//envoy/extensions/transport_sockets/s2a/v3alpha:pkg", + "//envoy/extensions/transport_sockets/s2a/v3:pkg", "//envoy/extensions/transport_sockets/starttls/v3:pkg", "//envoy/extensions/transport_sockets/tap/v3:pkg", "//envoy/extensions/transport_sockets/tls/v3:pkg", @@ -177,14 +177,14 @@ proto_library( "//envoy/extensions/upstreams/http/v3:pkg", "//envoy/extensions/upstreams/tcp/generic/v3:pkg", "//envoy/extensions/wasm/v3:pkg", - "//envoy/extensions/watchdog/profile_action/v3alpha:pkg", + "//envoy/extensions/watchdog/profile_action/v3:pkg", "//envoy/service/accesslog/v3:pkg", "//envoy/service/auth/v3:pkg", "//envoy/service/cluster/v3:pkg", "//envoy/service/discovery/v3:pkg", "//envoy/service/endpoint/v3:pkg", "//envoy/service/event_reporting/v3:pkg", - "//envoy/service/ext_proc/v3alpha:pkg", + "//envoy/service/ext_proc/v3:pkg", "//envoy/service/extension/v3:pkg", "//envoy/service/health/v3:pkg", "//envoy/service/listener/v3:pkg", @@ -202,7 +202,7 @@ proto_library( "//envoy/type/metadata/v3:pkg", "//envoy/type/tracing/v3:pkg", "//envoy/type/v3:pkg", - "//envoy/watchdog/v3alpha:pkg", + "//envoy/watchdog/v3:pkg", ], )