Merge branch 'main' into envoypatchpolicy-translate

envoyproxy · Jul 20, 2023 · 8458a4b · 8458a4b
2 parents 8aa818a + a028ec1
commit 8458a4b
Show file tree

Hide file tree

Showing 167 changed files with 912 additions and 909 deletions.
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
@@ -1,6 +1,6 @@
 {
   "xds": {
-    "envoy-gateway-system-eg": {
+    "envoy-gateway-system/eg": {
       "configs": [
         {
           "@type": "type.googleapis.com/envoy.admin.v3.BootstrapConfigDump",
@@ -183,7 +183,7 @@
             {
               "endpointConfig": {
                 "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-                "clusterName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
+                "clusterName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
                 "endpoints": [
                   {
                     "lbEndpoints": [
@@ -222,9 +222,9 @@
                     "ads": {},
                     "resourceApiVersion": "V3"
                   },
-                  "serviceName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
+                  "serviceName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
                 },
-                "name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
+                "name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
                 "outlierDetection": {},
                 "perConnectionBufferLimitBytes": 32768,
                 "type": "EDS"
@@ -350,7 +350,7 @@
                               "typedConfig": {
                                 "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication",
                                 "providers": {
-                                  "envoy-gateway-system-backend-rule-0-match-0-www.example.com-example": {
+                                  "envoy-gateway-system/backend/rule/0/match/0-www.example.com-example": {
                                     "remoteJwks": {
                                       "cacheDuration": "300s",
                                       "httpUri": {
@@ -362,8 +362,8 @@
                                   }
                                 },
                                 "requirementMap": {
-                                  "envoy-gateway-system-backend-rule-0-match-0-www.example.com": {
-                                    "providerName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com-example"
+                                  "envoy-gateway-system/backend/rule/0/match/0-www.example.com": {
+                                    "providerName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com-example"
                                   }
                                 }
                               }
@@ -383,7 +383,7 @@
                               "ads": {},
                               "resourceApiVersion": "V3"
                             },
-                            "routeConfigName": "envoy-gateway-system-eg-http"
+                            "routeConfigName": "envoy-gateway-system/eg/http"
                           },
                           "statPrefix": "http",
                           "upgradeConfigs": [
@@ -396,7 +396,7 @@
                       }
                     ]
                   },
-                  "name": "envoy-gateway-system-eg-http",
+                  "name": "envoy-gateway-system/eg/http",
                   "perConnectionBufferLimitBytes": 32768
                 }
               }
@@ -410,13 +410,13 @@
               "routeConfig": {
                 "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
                 "ignorePortInHostMatching": true,
-                "name": "envoy-gateway-system-eg-http",
+                "name": "envoy-gateway-system/eg/http",
                 "virtualHosts": [
                   {
                     "domains": [
                       "*"
                     ],
-                    "name": "envoy-gateway-system-eg-http",
+                    "name": "envoy-gateway-system/eg/http",
                     "routes": [
                       {
                         "match": {
@@ -430,14 +430,14 @@
                           ],
                           "pathSeparatedPrefix": "/foo"
                         },
-                        "name": "envoy-gateway-system-backend-rule-0-match-0-www.example.com",
+                        "name": "envoy-gateway-system/backend/rule/0/match/0-www.example.com",
                         "route": {
-                          "cluster": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
+                          "cluster": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
                         },
                         "typedPerFilterConfig": {
                           "envoy.filters.http.jwt_authn": {
                             "@type": "type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig",
-                            "requirementName": "envoy-gateway-system-backend-rule-0-match-0-www.example.com"
+                            "requirementName": "envoy-gateway-system/backend/rule/0/match/0-www.example.com"
                           }
                         }
                       }

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
@@ -1,5 +1,5 @@
 xds:
-  envoy-gateway-system-eg:
+  envoy-gateway-system/eg:
     configs:
     - '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump
       bootstrap:
@@ -103,7 +103,7 @@ xds:
       dynamicEndpointConfigs:
       - endpointConfig:
           '@type': type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment
-          clusterName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+          clusterName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
           endpoints:
           - lbEndpoints:
             - endpoint:
@@ -125,8 +125,8 @@ xds:
             edsConfig:
               ads: {}
               resourceApiVersion: V3
-            serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
-          name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+            serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
+          name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
           outlierDetection: {}
           perConnectionBufferLimitBytes: 32768
           type: EDS
@@ -208,16 +208,16 @@ xds:
                     typedConfig:
                       '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication
                       providers:
-                        envoy-gateway-system-backend-rule-0-match-0-www.example.com-example:
+                        envoy-gateway-system/backend/rule/0/match/0-www.example.com-example:
                           remoteJwks:
                             cacheDuration: 300s
                             httpUri:
                               cluster: raw_githubusercontent_com_443
                               timeout: 5s
                               uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json
                       requirementMap:
-                        envoy-gateway-system-backend-rule-0-match-0-www.example.com:
-                          providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example
+                        envoy-gateway-system/backend/rule/0/match/0-www.example.com:
+                          providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example
                   - name: envoy.filters.http.router
                     typedConfig:
                       '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
@@ -228,34 +228,34 @@ xds:
                     configSource:
                       ads: {}
                       resourceApiVersion: V3
-                    routeConfigName: envoy-gateway-system-eg-http
+                    routeConfigName: envoy-gateway-system/eg/http
                   statPrefix: http
                   upgradeConfigs:
                   - upgradeType: websocket
                   useRemoteAddress: true
-            name: envoy-gateway-system-eg-http
+            name: envoy-gateway-system/eg/http
             perConnectionBufferLimitBytes: 32768
     - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
       dynamicRouteConfigs:
       - routeConfig:
           '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
           ignorePortInHostMatching: true
-          name: envoy-gateway-system-eg-http
+          name: envoy-gateway-system/eg/http
           virtualHosts:
           - domains:
             - '*'
-            name: envoy-gateway-system-eg-http
+            name: envoy-gateway-system/eg/http
             routes:
             - match:
                 headers:
                 - name: :authority
                   stringMatch:
                     exact: www.example.com
                 pathSeparatedPrefix: /foo
-              name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+              name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
               route:
-                cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+                cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com
               typedPerFilterConfig:
                 envoy.filters.http.jwt_authn:
                   '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig
-                  requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+                  requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
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
@@ -1,5 +1,5 @@
 xds:
-  envoy-gateway-system-eg:
+  envoy-gateway-system/eg:
     '@type': type.googleapis.com/envoy.admin.v3.BootstrapConfigDump
     bootstrap:
       admin:

diff --git a/...rnal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml b/...rnal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.cluster.yaml
@@ -1,5 +1,5 @@
 xds:
-  envoy-gateway-system-eg:
+  envoy-gateway-system/eg:
     '@type': type.googleapis.com/envoy.admin.v3.ClustersConfigDump
     dynamicActiveClusters:
     - cluster:
@@ -12,8 +12,8 @@ xds:
           edsConfig:
             ads: {}
             resourceApiVersion: V3
-          serviceName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
-        name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+          serviceName: envoy-gateway-system/backend/rule/0/match/0-www.example.com
+        name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
         outlierDetection: {}
         perConnectionBufferLimitBytes: 32768
         type: EDS

diff --git a/...nal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.listener.yaml b/...nal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.listener.yaml
@@ -1,5 +1,5 @@
 xds:
-  envoy-gateway-system-eg:
+  envoy-gateway-system/eg:
     '@type': type.googleapis.com/envoy.admin.v3.ListenersConfigDump
     dynamicListeners:
     - activeState:
@@ -47,16 +47,16 @@ xds:
                   typedConfig:
                     '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.JwtAuthentication
                     providers:
-                      envoy-gateway-system-backend-rule-0-match-0-www.example.com-example:
+                      envoy-gateway-system/backend/rule/0/match/0-www.example.com-example:
                         remoteJwks:
                           cacheDuration: 300s
                           httpUri:
                             cluster: raw_githubusercontent_com_443
                             timeout: 5s
                             uri: https://raw.githubusercontent.com/envoyproxy/gateway/main/examples/kubernetes/authn/jwks.json
                     requirementMap:
-                      envoy-gateway-system-backend-rule-0-match-0-www.example.com:
-                        providerName: envoy-gateway-system-backend-rule-0-match-0-www.example.com-example
+                      envoy-gateway-system/backend/rule/0/match/0-www.example.com:
+                        providerName: envoy-gateway-system/backend/rule/0/match/0-www.example.com-example
                 - name: envoy.filters.http.router
                   typedConfig:
                     '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
@@ -67,10 +67,10 @@ xds:
                   configSource:
                     ads: {}
                     resourceApiVersion: V3
-                  routeConfigName: envoy-gateway-system-eg-http
+                  routeConfigName: envoy-gateway-system/eg/http
                 statPrefix: http
                 upgradeConfigs:
                 - upgradeType: websocket
                 useRemoteAddress: true
-          name: envoy-gateway-system-eg-http
+          name: envoy-gateway-system/eg/http
           perConnectionBufferLimitBytes: 32768
diff --git a/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.route.yaml b/internal/cmd/egctl/testdata/translate/out/authn-single-route-single-match-to-xds.route.yaml
@@ -1,26 +1,26 @@
 xds:
-  envoy-gateway-system-eg:
+  envoy-gateway-system/eg:
     '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
     dynamicRouteConfigs:
     - routeConfig:
         '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
         ignorePortInHostMatching: true
-        name: envoy-gateway-system-eg-http
+        name: envoy-gateway-system/eg/http
         virtualHosts:
         - domains:
           - '*'
-          name: envoy-gateway-system-eg-http
+          name: envoy-gateway-system/eg/http
           routes:
           - match:
               headers:
               - name: :authority
                 stringMatch:
                   exact: www.example.com
               pathSeparatedPrefix: /foo
-            name: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+            name: envoy-gateway-system/backend/rule/0/match/0-www.example.com
             route:
-              cluster: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+              cluster: envoy-gateway-system/backend/rule/0/match/0-www.example.com
             typedPerFilterConfig:
               envoy.filters.http.jwt_authn:
                 '@type': type.googleapis.com/envoy.extensions.filters.http.jwt_authn.v3.PerRouteConfig
-                requirementName: envoy-gateway-system-backend-rule-0-match-0-www.example.com
+                requirementName: envoy-gateway-system/backend/rule/0/match/0-www.example.com