Skip to content

NET-6942 - Replace usage of deprecated Envoy field envoy.config.cluster.v3.Cluster.http_protocol_options. #20010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmurret merged 2 commits into from
Dec 21, 2023
Merged

NET-6942 - Replace usage of deprecated Envoy field envoy.config.cluster.v3.Cluster.http_protocol_options. #20010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7971146
NET-6942 - Replace usage of deprecated Envoy field envoy.config.clust…
jmurret Dec 20, 2023
c9e5801
add changelog
jmurret Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/20010.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
xds: Replace usage of deprecated Envoy field `envoy.config.cluster.v3.Cluster.http_protocol_options`
```
9 changes: 8 additions & 1 deletion command/connect/envoy/bootstrap_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,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": {}
}
}
},
Comment on lines +657 to +663

@zalimeni zalimeni Dec 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

~~ Here and below, indent looks weird to me - seems like maybe a mix of tabs and spaces?

"loadAssignment": {
"clusterName": "` + clusterName + `",
"endpoints": [
Expand Down
27 changes: 24 additions & 3 deletions command/connect/envoy/bootstrap_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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": [
Expand All @@ -47,7 +54,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": [
Expand All @@ -73,7 +87,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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/envoy-readiness-probe.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-address-specified.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-nodemeta.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/ingress-gateway.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
9 changes: 8 additions & 1 deletion command/connect/envoy/testdata/prometheus-metrics.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
6 changes: 3 additions & 3 deletions test/integration/connect/envoy/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ func TestEnvoy(t *testing.T) {
caseDir := "CASE_DIR=" + tc

t.Cleanup(func() {
if t.Failed() {
runCmd(t, "capture_logs", caseDir)
}
//if t.Failed() {
runCmd(t, "capture_logs", caseDir)
//}
Comment on lines +53 to +55

@zalimeni zalimeni Dec 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe leftover from testing?


runCmd(t, "test_teardown", caseDir)
})
Expand Down