bootstrap: clean layered runtime (#2051)

* translator: add mock implement of RTDS Signed-off-by: zirain <[email protected]> * rename to runtimev3 Signed-off-by: zirain <[email protected]> * clean layered runtime Signed-off-by: zirain <[email protected]> * fix Signed-off-by: zirain <[email protected]> --------- Signed-off-by: zirain <[email protected]>
envoyproxy · Oct 24, 2023 · bdb0191 · bdb0191
1 parent a858547
commit bdb0191
Show file tree

Hide file tree

Showing 25 changed files with 1 addition and 223 deletions.
diff --git a/api/v1alpha1/validation/envoyproxy_validate.go b/api/v1alpha1/validation/envoyproxy_validate.go
@@ -151,11 +151,7 @@ func validateBootstrap(boostrapConfig *egv1a1.ProxyBootstrap) error {
 		cmp.Diff(userBootstrap.DynamicResources, defaultBootstrap.DynamicResources, protocmp.Transform()) != "" {
 		return fmt.Errorf("dynamic_resources cannot be modified")
 	}
-	// Ensure layered runtime resources config is same
-	if userBootstrap.LayeredRuntime == nil ||
-		cmp.Diff(userBootstrap.LayeredRuntime, defaultBootstrap.LayeredRuntime, protocmp.Transform()) != "" {
-		return fmt.Errorf("layered_runtime cannot be modified")
-	}
+
 	// Ensure that the xds_cluster config is same
 	var userXdsCluster, defaultXdsCluster *clusterv3.Cluster
 	for _, cluster := range userBootstrap.StaticResources.Clusters {

diff --git a/api/v1alpha1/validation/testdata/valid-user-bootstrap.yaml b/api/v1alpha1/validation/testdata/valid-user-bootstrap.yaml
@@ -22,14 +22,6 @@ dynamicResources:
   cdsConfig:
     ads: {}
     resourceApiVersion: V3
-layeredRuntime:
-  layers:
-  - name: runtime-0
-    rtdsLayer:
-      name: runtime-0
-      rtdsConfig:
-        ads: {}
-        resourceApiVersion: V3
 staticResources:
   clusters:
   - connectTimeout: 10s

diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.json
@@ -44,20 +44,6 @@
                 "resourceApiVersion": "V3"
               }
             },
-            "layeredRuntime": {
-              "layers": [
-                {
-                  "name": "runtime-0",
-                  "rtdsLayer": {
-                    "name": "runtime-0",
-                    "rtdsConfig": {
-                      "ads": {},
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                }
-              ]
-            },
             "staticResources": {
               "clusters": [
                 {

diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.all.yaml
@@ -27,14 +27,6 @@ xds:
           ldsConfig:
             ads: {}
             resourceApiVersion: V3
-        layeredRuntime:
-          layers:
-          - name: runtime-0
-            rtdsLayer:
-              name: runtime-0
-              rtdsConfig:
-                ads: {}
-                resourceApiVersion: V3
         staticResources:
           clusters:
           - connectTimeout: 0.250s

diff --git a/...al/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml b/...al/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.bootstrap.yaml
@@ -26,14 +26,6 @@ xds:
         ldsConfig:
           ads: {}
           resourceApiVersion: V3
-      layeredRuntime:
-        layers:
-        - name: runtime-0
-          rtdsLayer:
-            name: runtime-0
-            rtdsConfig:
-              ads: {}
-              resourceApiVersion: V3
       staticResources:
         clusters:
         - connectTimeout: 0.250s

diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -124,14 +124,6 @@ envoyProxy:
                       path_config_source:
                         path: "/sds/xds-trusted-ca.json"
                       resource_api_version: V3
-        layered_runtime:
-          layers:
-          - name: runtime-0
-            rtds_layer:
-              rtds_config:
-                ads: {}
-                resource_api_version: V3
-              name: runtime-0
     logging: {}
   status: {}
 gatewayClass:
@@ -504,14 +496,6 @@ xds:
           ldsConfig:
             ads: {}
             resourceApiVersion: V3
-        layeredRuntime:
-          layers:
-          - name: runtime-0
-            rtdsLayer:
-              name: runtime-0
-              rtdsConfig:
-                ads: {}
-                resourceApiVersion: V3
         staticResources:
           clusters:
           - connectTimeout: 0.250s

diff --git a/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml b/internal/cmd/egctl/testdata/translate/out/envoy-patch-policy.all.yaml
@@ -27,14 +27,6 @@ xds:
           ldsConfig:
             ads: {}
             resourceApiVersion: V3
-        layeredRuntime:
-          layers:
-          - name: runtime-0
-            rtdsLayer:
-              name: runtime-0
-              rtdsConfig:
-                ads: {}
-                resourceApiVersion: V3
         staticResources:
           clusters:
           - connectTimeout: 0.250s

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -44,20 +44,6 @@
                 "resourceApiVersion": "V3"
               }
             },
-            "layeredRuntime": {
-              "layers": [
-                {
-                  "name": "runtime-0",
-                  "rtdsLayer": {
-                    "name": "runtime-0",
-                    "rtdsConfig": {
-                      "ads": {},
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                }
-              ]
-            },
             "staticResources": {
               "clusters": [
                 {

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -27,14 +27,6 @@ xds:
           ldsConfig:
             ads: {}
             resourceApiVersion: V3
-        layeredRuntime:
-          layers:
-          - name: runtime-0
-            rtdsLayer:
-              name: runtime-0
-              rtdsConfig:
-                ads: {}
-                resourceApiVersion: V3
         staticResources:
           clusters:
           - connectTimeout: 0.250s

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.bootstrap.yaml
@@ -26,14 +26,6 @@ xds:
         ldsConfig:
           ads: {}
           resourceApiVersion: V3
-      layeredRuntime:
-        layers:
-        - name: runtime-0
-          rtdsLayer:
-            name: runtime-0
-            rtdsConfig:
-              ads: {}
-              resourceApiVersion: V3
       staticResources:
         clusters:
         - connectTimeout: 0.250s

diff --git a/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.json b/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.json
@@ -44,20 +44,6 @@
                 "resourceApiVersion": "V3"
               }
             },
-            "layeredRuntime": {
-              "layers": [
-                {
-                  "name": "runtime-0",
-                  "rtdsLayer": {
-                    "name": "runtime-0",
-                    "rtdsConfig": {
-                      "ads": {},
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                }
-              ]
-            },
             "staticResources": {
               "clusters": [
                 {

diff --git a/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.yaml b/.../egctl/testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.all.yaml
@@ -27,14 +27,6 @@ xds:
           ldsConfig:
             ads: {}
             resourceApiVersion: V3
-        layeredRuntime:
-          layers:
-          - name: runtime-0
-            rtdsLayer:
-              name: runtime-0
-              rtdsConfig:
-                ads: {}
-                resourceApiVersion: V3
         staticResources:
           clusters:
           - connectTimeout: 0.250s

diff --git a/.../testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.bootstrap.yaml b/.../testdata/translate/out/rate-limit-filter-single-route-single-match-to-xds.bootstrap.yaml
@@ -26,14 +26,6 @@ xds:
         ldsConfig:
           ads: {}
           resourceApiVersion: V3
-      layeredRuntime:
-        layers:
-        - name: runtime-0
-          rtdsLayer:
-            name: runtime-0
-            rtdsConfig:
-              ads: {}
-              resourceApiVersion: V3
       staticResources:
         clusters:
         - connectTimeout: 0.250s

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
@@ -134,14 +134,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml b/...rnal/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
@@ -134,14 +134,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
@@ -132,14 +132,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
@@ -130,14 +130,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/enable-prometheus.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/enable-prometheus.yaml
@@ -156,14 +156,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
@@ -132,14 +132,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml b/internal/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
@@ -132,14 +132,6 @@ spec:
                             path_config_source:
                               path: "/sds/xds-trusted-ca.json"
                             resource_api_version: V3
-              layered_runtime:
-                layers:
-                - name: runtime-0
-                  rtds_layer:
-                    rtds_config:
-                      ads: {}
-                      resource_api_version: V3
-                    name: runtime-0
             - --log-level warn
             - --cpuset-threads
           command:

diff --git a/internal/xds/bootstrap/bootstrap.yaml.tpl b/internal/xds/bootstrap/bootstrap.yaml.tpl
@@ -167,11 +167,3 @@ static_resources:
               path_config_source:
                 path: "/sds/xds-trusted-ca.json"
               resource_api_version: V3
-layered_runtime:
-  layers:
-  - name: runtime-0
-    rtds_layer:
-      rtds_config:
-        ads: {}
-        resource_api_version: V3
-      name: runtime-0
diff --git a/internal/xds/bootstrap/testdata/custom-stats-matcher.yaml b/internal/xds/bootstrap/testdata/custom-stats-matcher.yaml
@@ -125,11 +125,3 @@ static_resources:
               path_config_source:
                 path: "/sds/xds-trusted-ca.json"
               resource_api_version: V3
-layered_runtime:
-  layers:
-  - name: runtime-0
-    rtds_layer:
-      rtds_config:
-        ads: {}
-        resource_api_version: V3
-      name: runtime-0
diff --git a/internal/xds/bootstrap/testdata/disable-prometheus.yaml b/internal/xds/bootstrap/testdata/disable-prometheus.yaml
@@ -93,11 +93,3 @@ static_resources:
               path_config_source:
                 path: "/sds/xds-trusted-ca.json"
               resource_api_version: V3
-layered_runtime:
-  layers:
-  - name: runtime-0
-    rtds_layer:
-      rtds_config:
-        ads: {}
-        resource_api_version: V3
-      name: runtime-0
diff --git a/internal/xds/bootstrap/testdata/enable-prometheus.yaml b/internal/xds/bootstrap/testdata/enable-prometheus.yaml
@@ -115,11 +115,3 @@ static_resources:
               path_config_source:
                 path: "/sds/xds-trusted-ca.json"
               resource_api_version: V3
-layered_runtime:
-  layers:
-  - name: runtime-0
-    rtds_layer:
-      rtds_config:
-        ads: {}
-        resource_api_version: V3
-      name: runtime-0
diff --git a/internal/xds/bootstrap/testdata/otel-metrics.yaml b/internal/xds/bootstrap/testdata/otel-metrics.yaml
@@ -118,11 +118,3 @@ static_resources:
               path_config_source:
                 path: "/sds/xds-trusted-ca.json"
               resource_api_version: V3
-layered_runtime:
-  layers:
-  - name: runtime-0
-    rtds_layer:
-      rtds_config:
-        ads: {}
-        resource_api_version: V3
-      name: runtime-0