From 0290f8b0ce62d123b84e86ae1841c410bb6a73c1 Mon Sep 17 00:00:00 2001
From: lubronzhan <lzhan@vmware.com>
Date: Tue, 9 Jan 2024 18:31:03 -0800
Subject: [PATCH 1/2] Remove static base runtime layer from bootstrap

Signed-off-by: lubronzhan <lzhan@vmware.com>
---
 internal/envoy/v3/bootstrap.go      |  6 ---
 internal/envoy/v3/bootstrap_test.go | 70 -----------------------------
 2 files changed, 76 deletions(-)

diff --git a/internal/envoy/v3/bootstrap.go b/internal/envoy/v3/bootstrap.go
index 904c5288f26..bcd010cb2b0 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 fa01f916342..4caab7973c5 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": {

From f9c40b7bb166404dc21f33213b11b36929f98733 Mon Sep 17 00:00:00 2001
From: lubronzhan <lzhan@vmware.com>
Date: Tue, 9 Jan 2024 18:34:23 -0800
Subject: [PATCH 2/2] Doc update

Signed-off-by: lubronzhan <lzhan@vmware.com>
---
 changelogs/unreleased/6063-lubronzhan-small.md | 1 +
 1 file changed, 1 insertion(+)
 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