github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport of NET-6942 - Replace usage of deprecated Envoy field envoy.config.cluster.v3.Cluster.http_protocol_options. into release/1.15.x (#20031) 

fix formatting issue in envoy bootstrapping

Co-authored-by: John Murret <john.murret@hashicorp.com>
pull/20041/head
hc-github-team-consul-core 2023-12-21 17:19:17 -06:00 committed by GitHub
parent c56fcacbb2
commit 3b70b66ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 118 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/20010.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
xds: Replace usage of deprecated Envoy field `envoy.config.cluster.v3.Cluster.http_protocol_options`
```

9
command/connect/envoy/bootstrap_config.go
View File

@ -650,7 +650,14 @@ func (c *BootstrapConfig) generateListenerConfig(args *BootstrapTplArgs, bindAdd
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "` + clusterName + `",
"endpoints": [

27
command/connect/envoy/bootstrap_config_test.go
View File

@ -18,7 +18,14 @@ const (
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [
@ -44,7 +51,14 @@ const (
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [
@ -70,7 +84,14 @@ const (
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "prometheus_backend",
"endpoints": [

9
command/connect/envoy/testdata/envoy-readiness-probe.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/ingress-gateway-address-specified.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/ingress-gateway-nodemeta.golden vendored
View File

@ -75,7 +75,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/ingress-gateway.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "self_admin",
"endpoints": [

9
command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "prometheus_backend",
"endpoints": [

9
command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "prometheus_backend",
"endpoints": [

9
command/connect/envoy/testdata/prometheus-metrics.golden vendored
View File

@ -74,7 +74,14 @@
"ignore_health_on_host_removal": false,
"connect_timeout": "5s",
"type": "STATIC",
"http_protocol_options": {},
"typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": {
"http_protocol_options": {}
}
}
},
"loadAssignment": {
"clusterName": "prometheus_backend",
"endpoints": [

4
test/integration/connect/envoy/main_test.go
View File

@ -25,9 +25,9 @@ func TestEnvoy(t *testing.T) {
caseDir := "CASE_DIR=" + tc
t.Cleanup(func() {
if t.Failed() {
//if t.Failed() {
runCmd(t, "capture_logs", caseDir)
}
//}
runCmd(t, "test_teardown", caseDir)
})