Skip to content
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

Remove static base runtime layer from bootstrap #6063

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Remove static base runtime layer from bootstrap #6063

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
0290f8b
Remove static base runtime layer from bootstrap
lubronzhan Jan 10, 2024
f9c40b7
Doc update
lubronzhan Jan 10, 2024
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
1 change: 1 addition & 0 deletions changelogs/unreleased/6063-lubronzhan-small.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove static base runtime layer from bootstrap
6 changes: 0 additions & 6 deletions internal/envoy/v3/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,6 @@ func bootstrapConfig(c *envoy.BootstrapConfig) *envoy_bootstrap_v3.Bootstrap {
bootstrap := &envoy_bootstrap_v3.Bootstrap{
LayeredRuntime: &envoy_bootstrap_v3.LayeredRuntime{
Layers: []*envoy_bootstrap_v3.RuntimeLayer{
{
Name: "base",
LayerSpecifier: &envoy_bootstrap_v3.RuntimeLayer_StaticLayer{
StaticLayer: baseRuntimeLayer(),
},
},
{
Name: "dynamic",
LayerSpecifier: &envoy_bootstrap_v3.RuntimeLayer_RtdsLayer_{
Expand Down
70 changes: 0 additions & 70 deletions internal/envoy/v3/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -368,13 +361,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -554,13 +540,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -741,13 +720,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -928,13 +900,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -1115,13 +1080,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -1304,13 +1262,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -1527,13 +1478,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -1748,13 +1692,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down Expand Up @@ -1964,13 +1901,6 @@ func TestBootstrap(t *testing.T) {
},
"layered_runtime": {
"layers": [
{
"name": "base",
"static_layer": {
"re2.max_program_size.error_level": 1048576,
"re2.max_program_size.warn_level": 1000
}
},
{
"name": "dynamic",
"rtds_layer": {
Expand Down
Loading