mirror of https://github.com/istio/proxy.git
Automator: update common-files@master in istio/proxy@master (#4160)
This commit is contained in:
parent
73e42080f0
commit
16ad1e7be2
|
|
@ -1 +1 @@
|
||||||
1eec846bd9c3f3d65f851241a914c6157450e25d
|
462a77976912bd3d53142f2789a8405203807df2
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ fi
|
||||||
|
|
||||||
# Build image to use
|
# Build image to use
|
||||||
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
|
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
|
||||||
IMAGE_VERSION=master-666a4e5bea9e23bb4a4149580cde51dbb0014f82
|
IMAGE_VERSION=master-2ab700be8e1b55f4292fb2eda2539e0f9aa373a7
|
||||||
fi
|
fi
|
||||||
if [[ "${IMAGE_NAME:-}" == "" ]]; then
|
if [[ "${IMAGE_NAME:-}" == "" ]]; then
|
||||||
IMAGE_NAME=build-tools
|
IMAGE_NAME=build-tools
|
||||||
|
|
|
||||||
|
|
@ -599,19 +599,35 @@ func listenerTcp_serverYamlTmpl() (*asset, error) {
|
||||||
var _listenerTerminate_connectYamlTmpl = []byte(`name: terminate_connect
|
var _listenerTerminate_connectYamlTmpl = []byte(`name: terminate_connect
|
||||||
address:
|
address:
|
||||||
socket_address:
|
socket_address:
|
||||||
|
{{ if eq .Vars.quic "true" }}
|
||||||
|
protocol: UDP
|
||||||
|
{{ end }}
|
||||||
address: 127.0.0.1
|
address: 127.0.0.1
|
||||||
port_value: {{ .Ports.ServerTunnelPort }}
|
port_value: {{ .Ports.ServerTunnelPort }}
|
||||||
|
{{ if eq .Vars.quic "true" }}
|
||||||
|
udp_listener_config:
|
||||||
|
quic_options: {}
|
||||||
|
downstream_socket_config:
|
||||||
|
prefer_gro: true
|
||||||
|
{{ end }}
|
||||||
filter_chains:
|
filter_chains:
|
||||||
- filters:
|
- filters:
|
||||||
# Capture SSL info for the internal listener passthrough
|
# Capture SSL info for the internal listener passthrough
|
||||||
|
{{ if eq .Vars.quic "true" }}
|
||||||
|
# TODO: accessing uriSanPeerCertificates() triggers a crash in quiche version.
|
||||||
|
{{ else }}
|
||||||
- name: capture_tls
|
- name: capture_tls
|
||||||
typed_config:
|
typed_config:
|
||||||
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
|
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
|
||||||
type_url: istio.tls_passthrough.v1.CaptureTLS
|
type_url: istio.tls_passthrough.v1.CaptureTLS
|
||||||
|
{{ end }}
|
||||||
- name: envoy.filters.network.http_connection_manager
|
- name: envoy.filters.network.http_connection_manager
|
||||||
typed_config:
|
typed_config:
|
||||||
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
|
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
|
||||||
stat_prefix: terminate_connect
|
stat_prefix: terminate_connect
|
||||||
|
{{ if eq .Vars.quic "true" }}
|
||||||
|
codec_type: HTTP3
|
||||||
|
{{ end }}
|
||||||
route_config:
|
route_config:
|
||||||
name: local_route
|
name: local_route
|
||||||
virtual_hosts:
|
virtual_hosts:
|
||||||
|
|
@ -637,6 +653,29 @@ filter_chains:
|
||||||
upgrade_configs:
|
upgrade_configs:
|
||||||
- upgrade_type: CONNECT
|
- upgrade_type: CONNECT
|
||||||
transport_socket:
|
transport_socket:
|
||||||
|
{{ if eq .Vars.quic "true" }}
|
||||||
|
name: quic
|
||||||
|
typed_config:
|
||||||
|
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
|
||||||
|
type_url: type.googleapis.com/envoy.extensions.transport_sockets.quic.v3.QuicDownstreamTransport
|
||||||
|
value:
|
||||||
|
downstream_tls_context:
|
||||||
|
common_tls_context:
|
||||||
|
tls_certificate_sds_secret_configs:
|
||||||
|
name: server
|
||||||
|
sds_config:
|
||||||
|
api_config_source:
|
||||||
|
api_type: GRPC
|
||||||
|
grpc_services:
|
||||||
|
- envoy_grpc:
|
||||||
|
cluster_name: xds_cluster
|
||||||
|
set_node_on_first_message_only: true
|
||||||
|
transport_api_version: V3
|
||||||
|
resource_api_version: V3
|
||||||
|
validation_context:
|
||||||
|
trusted_ca: { filename: "testdata/certs/root.cert" }
|
||||||
|
require_client_certificate: true # XXX: This setting is ignored ATM per @danzh.
|
||||||
|
{{ else }}
|
||||||
name: tls
|
name: tls
|
||||||
typed_config:
|
typed_config:
|
||||||
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
|
"@type": type.googleapis.com/udpa.type.v1.TypedStruct
|
||||||
|
|
@ -657,6 +696,7 @@ filter_chains:
|
||||||
validation_context:
|
validation_context:
|
||||||
trusted_ca: { filename: "testdata/certs/root.cert" }
|
trusted_ca: { filename: "testdata/certs/root.cert" }
|
||||||
require_client_certificate: true
|
require_client_certificate: true
|
||||||
|
{{ end }}
|
||||||
`)
|
`)
|
||||||
|
|
||||||
func listenerTerminate_connectYamlTmplBytes() ([]byte, error) {
|
func listenerTerminate_connectYamlTmplBytes() ([]byte, error) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue