Skip to content

Commit

Permalink
repo: Yaml cleanups (envoyproxy#23654)
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Northey <ryan@synca.io>
  • Loading branch information
phlax authored Nov 1, 2022
1 parent 36fc1cc commit 9a3b541
Show file tree
Hide file tree
Showing 54 changed files with 254 additions and 273 deletions.
13 changes: 10 additions & 3 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
extends: default

rules:
line-length:
max: 200
level: warning
document-start: false
indentation:
spaces: consistent
indent-sequences: false
line-length:
max: 200
level: warning
truthy:
allowed-values:
- "yes"
- "no"
- "true"
- "false"
2 changes: 1 addition & 1 deletion .zuul.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: envoyproxy/envoy
check:
jobs:
- envoy-build-arm64
- envoy-build-arm64

- job:
name: envoy-build-arm64
Expand Down
28 changes: 14 additions & 14 deletions api/buf.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
version: v1
deps:
- buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
- buf.build/opencensus/opencensus
- buf.build/beta/prometheus
- buf.build/opentelemetry/opentelemetry
- buf.build/gogo/protobuf
- buf.build/cncf/xds
- buf.build/googleapis/googleapis:62f35d8aed1149c291d606d958a7ce32
- buf.build/opencensus/opencensus
- buf.build/beta/prometheus
- buf.build/opentelemetry/opentelemetry
- buf.build/gogo/protobuf
- buf.build/cncf/xds
breaking:
ignore_unstable_packages: true
use:
- FIELD_SAME_ONEOF
- FIELD_SAME_JSON_NAME
- FIELD_SAME_NAME
- FIELD_SAME_TYPE
- FIELD_SAME_LABEL
- FILE_SAME_PACKAGE
- FIELD_NO_DELETE_UNLESS_NUMBER_RESERVED
- FIELD_NO_DELETE_UNLESS_NAME_RESERVED
- FIELD_SAME_ONEOF
- FIELD_SAME_JSON_NAME
- FIELD_SAME_NAME
- FIELD_SAME_TYPE
- FIELD_SAME_LABEL
- FILE_SAME_PACKAGE
- FIELD_NO_DELETE_UNLESS_NUMBER_RESERVED
- FIELD_NO_DELETE_UNLESS_NAME_RESERVED
lint:
use:
- IMPORT_USED
2 changes: 1 addition & 1 deletion changelogs/1.13.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ changes:
added initial support for :ref:`UDP proxy <config_udp_listener_filters_udp_proxy>`.
deprecated:
- area: tracing
- area: tracing
change: |
The ``request_headers_for_tags`` field in :ref:`HTTP connection manager
<envoy_api_msg_config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing>`
Expand Down
1 change: 0 additions & 1 deletion changelogs/1.19.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ bug_fixes:
- area: router
change: |
fixed CVE-2022-29227 which caused an internal redirect crash for requests with body/trailers. Envoy would previously crash in some cases when processing internal redirects for requests with bodies or trailers if the redirect prompts an Envoy-generated local reply.
1 change: 0 additions & 1 deletion changelogs/1.20.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ bug_fixes:
- area: router
change: |
fixed CVE-2022-29227 which caused an internal redirect crash for requests with body/trailers. Envoy would previously crash in some cases when processing internal redirects for requests with bodies or trailers if the redirect prompts an Envoy-generated local reply.
1 change: 0 additions & 1 deletion changelogs/1.20.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: docker
change: |
update Docker images (``distroless`` -> ``d65ac1a``) to resolve CVE issues in container packages.
1 change: 0 additions & 1 deletion changelogs/1.20.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: ci
change: |
fix disk space issue that have prevented publication.
1 change: 0 additions & 1 deletion changelogs/1.20.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: docker
change: |
update Docker images (``distroless`` -> ``49d2923f35d6``) to resolve CVE issues in container packages.
1 change: 0 additions & 1 deletion changelogs/1.21.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ minor_behavior_changes:
- area: perf
change: |
ssl contexts are now tracked without scan based garbage collection and greatly improved the performance on secret update.
1 change: 0 additions & 1 deletion changelogs/1.21.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ bug_fixes:
- area: router
change: |
fixed CVE-2022-29227 which caused an internal redirect crash for requests with body/trailers. Envoy would previously crash in some cases when processing internal redirects for requests with bodies or trailers if the redirect prompts an Envoy-generated local reply.
1 change: 0 additions & 1 deletion changelogs/1.21.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ bug_fixes:
- area: docker
change: |
update Docker images (``distroless`` -> ``d65ac1a``) to resolve CVE issues in container packages.
1 change: 0 additions & 1 deletion changelogs/1.21.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: docker
change: |
update Docker images (``distroless`` -> ``49d2923f35d6``) to resolve CVE issues in container packages.
1 change: 0 additions & 1 deletion changelogs/1.22.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,3 @@ bug_fixes:
- area: router
change: |
fixed CVE-2022-29227 which caused an internal redirect crash for requests with body/trailers. Envoy would previously crash in some cases when processing internal redirects for requests with bodies or trailers if the redirect prompts an Envoy-generated local reply.
1 change: 0 additions & 1 deletion changelogs/1.22.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: ci
change: |
fixes/workarounds for CI that prevented publication of version 1.22.1.
1 change: 0 additions & 1 deletion changelogs/1.22.3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: docker
change: |
update Docker images (``distroless`` -> ``49d2923f35d6``) to resolve CVE issues in container packages.
1 change: 0 additions & 1 deletion changelogs/1.22.4.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: repo
change: |
fix version to resolve release issue.
1 change: 0 additions & 1 deletion changelogs/1.22.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ bug_fixes:
- area: transport_socket
change: |
fixed a bug that prevented the tcp stats to be retrieved when running on kernels different than the kernel where Envoy was built.
1 change: 0 additions & 1 deletion changelogs/1.23.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -423,4 +423,3 @@ deprecated:
change: |
deprecated :ref:`inline_code <envoy_v3_api_field_extensions.filters.http.lua.v3.Lua.inline_code>`. Please use
:ref:`default_source_code <envoy_v3_api_field_extensions.filters.http.lua.v3.Lua.default_source_code>`.
1 change: 0 additions & 1 deletion changelogs/1.23.1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ bug_fixes:
- area: listener
change: |
fixed a bug that doesn't handle of an update for a listener with IPv4-mapped address correctly and that will lead to a memory leak.
1 change: 0 additions & 1 deletion changelogs/1.23.2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ bug_fixes:
change: |
fixed a bug causing response headers set by a Lua script to not be sent in the response (https://github.com/envoyproxy/envoy/issues/22401).
This bug was introduced in Envoy v1.23.0.
1 change: 0 additions & 1 deletion changelogs/1.24.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,3 @@ deprecated:
:ref:`Route.typed_per_filter_config<envoy_v3_api_field_config.route.v3.Route.typed_per_filter_config>` or
:ref:`WeightedCluster.ClusterWeight.typed_per_filter_config<envoy_v3_api_field_config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config>`
to configure the CORS HTTP filter by the type :ref:`CorsPolicy in filter <envoy_v3_api_msg_extensions.filters.http.cors.v3.CorsPolicy>`.
55 changes: 27 additions & 28 deletions changelogs/current.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,33 @@ bug_fixes:
removed_config_or_runtime:
# *Normally occurs at the end of the* :ref:`deprecation period <deprecated>`

- area: eds
change: |
removed ``envoy.reloadable_features.support_locality_update_on_eds_cluster_endpoints`` and legacy code paths.
- area: listener
change: |
removed ``envoy.reloadable_features.strict_check_on_ipv4_compat`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.deprecate_global_ints`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.allow_adding_content_type_in_local_replies`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.allow_upstream_inline_write`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.append_or_truncate`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.use_new_codec_wrapper`` and legacy code paths.
removed ``envoy.reloadable_features.append_to_accept_content_encoding_only_once`` and legacy code paths.
removed ``envoy.reloadable_features.http1_lazy_read_disable`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.http_100_continue_case_insensitive`` and legacy code paths.
removed ``envoy.reloadable_features.override_request_timeout_by_gateway_timeout`` and legacy code paths.
- area: eds
change: |
removed ``envoy.reloadable_features.support_locality_update_on_eds_cluster_endpoints`` and legacy code paths.
- area: listener
change: |
removed ``envoy.reloadable_features.strict_check_on_ipv4_compat`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.deprecate_global_ints`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.allow_adding_content_type_in_local_replies`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.allow_upstream_inline_write`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.append_or_truncate`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.use_new_codec_wrapper`` and legacy code paths.
removed ``envoy.reloadable_features.append_to_accept_content_encoding_only_once`` and legacy code paths.
removed ``envoy.reloadable_features.http1_lazy_read_disable`` and legacy code paths.
- area: http
change: |
removed ``envoy.reloadable_features.http_100_continue_case_insensitive`` and legacy code paths.
removed ``envoy.reloadable_features.override_request_timeout_by_gateway_timeout`` and legacy code paths.
new_features:
- area: generic_proxy
Expand Down
6 changes: 3 additions & 3 deletions configs/encapsulate_http_in_http2_connect.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This configuration takes incoming HTTP requests on port 10000 and encapsulates it in a CONNECT
# request which is sent upstream port 10001.
bootstrap_extensions:
- name: envoy.bootstrap.internal_listener
typed_config:
"@type": type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener
- name: envoy.bootstrap.internal_listener
typed_config:
"@type": type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener
static_resources:
listeners:
- name: http
Expand Down
6 changes: 3 additions & 3 deletions configs/internal_listener_proxy.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This configuration listens on port 9999 and creates TCP connections to port 10000 using an
# intermediate internal listener.
bootstrap_extensions:
- name: envoy.bootstrap.internal_listener
typed_config:
"@type": type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener
- name: envoy.bootstrap.internal_listener
typed_config:
"@type": type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener
static_resources:
listeners:
- name: ingress
Expand Down
6 changes: 3 additions & 3 deletions configs/terminate_http1_connect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ static_resources:
connect_matcher:
{}
headers:
- name: foo
string_match:
exact: bar
- name: foo
string_match:
exact: bar
route:
cluster: local_original_dst
upgrade_configs:
Expand Down
6 changes: 3 additions & 3 deletions configs/terminate_http_in_http2_connect.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This configuration terminates h2 CONNECT on port 10001 and then chains an HTTP filter that always responds with 200 using
# an internal listener.
bootstrap_extensions:
- name: envoy.bootstrap.internal_listener
typed_config:
"@type": type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener
- name: envoy.bootstrap.internal_listener
typed_config:
"@type": type.googleapis.com/envoy.extensions.bootstrap.internal_listener.v3.InternalListener
static_resources:
listeners:
- name: listener_0
Expand Down
21 changes: 10 additions & 11 deletions configs/upstream-filters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,20 @@ static_resources:
http2_protocol_options:
{}
http_filters:
- name: buffer
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.http.buffer.v3.Buffer
max_request_bytes: 5242880
- name: envoy.filters.http.upstream_codec
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
- name: buffer
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.http.buffer.v3.Buffer
max_request_bytes: 5242880
- name: envoy.filters.http.upstream_codec
typed_config:
"@type": type.googleapis.com/envoy.extensions.filters.http.upstream_codec.v3.UpstreamCodec
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
sni: www.envoyproxy.io
layered_runtime:
layers:
- name: static_layer
static_layer:
envoy.reloadable_features.allow_upstream_filters: true

- name: static_layer
static_layer:
envoy.reloadable_features.allow_upstream_filters: true
1 change: 0 additions & 1 deletion distribution/distros.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

debian_bullseye:
image: debian:bullseye-slim
ext: bullseye.changes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

static_resources:
listeners:
- address:
Expand Down Expand Up @@ -54,8 +53,8 @@ static_resources:
- '*'
name: local_service
routes:
- match: { prefix: "/" }
route: { cluster: default_service }
- match: {prefix: "/"}
route: {cluster: default_service}
clusters:
- name: default_service
load_assignment:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ static_resources:
lb_subset_config:
fallback_policy: ANY_ENDPOINT
subset_selectors:
- keys:
- default
- keys:
- version
- keys:
- default
- keys:
- version
load_assignment:
cluster_name: versioned-cluster
endpoints:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ static_resources:
numerator: 100
denominator: HUNDRED
response_headers_to_add:
- append_action: OVERWRITE_IF_EXISTS_OR_ADD
header:
key: x-local-rate-limit
value: 'true'
- append_action: OVERWRITE_IF_EXISTS_OR_ADD
header:
key: x-local-rate-limit
value: 'true'
local_rate_limit_per_downstream_connection: false
- name: envoy.filters.http.router
typed_config:
Expand All @@ -44,8 +44,8 @@ static_resources:
- name: local_service
domains: ["*"]
routes:
- match: { prefix: "/" }
route: { cluster: default_service }
- match: {prefix: "/"}
route: {cluster: default_service}
clusters:
- name: default_service
load_assignment:
Expand Down
Loading

0 comments on commit 9a3b541

Please sign in to comment.