From d8931d43fca792ff366b1a4ddc405a7e514def12 Mon Sep 17 00:00:00 2001
From: Lubron <lubronzhan@gmail.com>
Date: Wed, 10 Jan 2024 09:26:29 -0800
Subject: [PATCH] Remove static base runtime layer from bootstrap (#6063)

Signed-off-by: lubronzhan <lzhan@vmware.com>
Co-authored-by: lubronzhan <lzhan@vmware.com>
---
 .../unreleased/6063-lubronzhan-small.md       |  1 +
 internal/envoy/v3/bootstrap.go                |  6 --
 internal/envoy/v3/bootstrap_test.go           | 70 -------------------
 3 files changed, 1 insertion(+), 76 deletions(-)
 create mode 100644 changelogs/unreleased/6063-lubronzhan-small.md

diff --git a/changelogs/unreleased/6063-lubronzhan-small.md b/changelogs/unreleased/6063-lubronzhan-small.md
new file mode 100644
index 00000000000..e9b526895fa
--- /dev/null
+++ b/changelogs/unreleased/6063-lubronzhan-small.md
@@ -0,0 +1 @@
+Remove static base runtime layer from bootstrap
diff --git a/internal/envoy/v3/bootstrap.go b/internal/envoy/v3/bootstrap.go
index ba39f1e2366..8ede43a630c 100644
--- a/internal/envoy/v3/bootstrap.go
+++ b/internal/envoy/v3/bootstrap.go
@@ -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_{
diff --git a/internal/envoy/v3/bootstrap_test.go b/internal/envoy/v3/bootstrap_test.go
index 5d1d89d1d89..d9dedc1ba55 100644
--- a/internal/envoy/v3/bootstrap_test.go
+++ b/internal/envoy/v3/bootstrap_test.go
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {
@@ -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": {