fix(xds): explicitly set initial fetch timeout to zero to keep Envoy …

…wait for xds resources (#11024) * fix(xds): explicitly set initial fetch timeout to zero to keep Envoy wait for xds resources --------- Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
kumahq · Aug 6, 2024 · 453360d · 453360d
1 parent 8a27969
commit 453360d
Show file tree

Hide file tree

Showing 197 changed files with 728 additions and 0 deletions.
diff --git a/...policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.cluster.golden.yaml b/...policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.cluster.golden.yaml
@@ -2,6 +2,7 @@ connectTimeout: 5s
 edsClusterConfig:
   edsConfig:
     ads: {}
+    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-c58ee0574727fc94
 perConnectionBufferLimitBytes: 32768

diff --git a/...olicies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml b/...olicies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml
@@ -56,6 +56,7 @@ filterChains:
       rds:
         configSource:
           ads: {}
+          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: gateway:HTTP:8080:*
       requestHeadersTimeout: 0.500s

diff --git a/...ns/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml b/...ns/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
@@ -9,6 +9,7 @@ connectTimeout: 5s
 edsClusterConfig:
   edsConfig:
     ads: {}
+    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-26cb64fa4e85e7b7
 perConnectionBufferLimitBytes: 32768

diff --git a/...s/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/...s/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml
@@ -56,6 +56,7 @@ filterChains:
       rds:
         configSource:
           ads: {}
+          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080:*
       requestHeadersTimeout: 0.500s

diff --git a/.../meshhealthcheck/plugin/v1alpha1/testdata/basic-meshhttproute.gateway_cluster.golden.yaml b/.../meshhealthcheck/plugin/v1alpha1/testdata/basic-meshhttproute.gateway_cluster.golden.yaml
@@ -11,6 +11,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     healthChecks:
     - eventLogger:
@@ -67,6 +68,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-945e63bff332f46a
     perConnectionBufferLimitBytes: 32768

diff --git a/...ugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml b/...ugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
@@ -11,6 +11,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     healthChecks:
     - eventLogger:

diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic.clusters.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS
@@ -19,6 +20,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-c72efb5be46fae6b
     type: EDS

diff --git a/.../policies/meshhttproute/plugin/v1alpha1/testdata/default-meshservice.clusters.golden.yaml b/.../policies/meshhttproute/plugin/v1alpha1/testdata/default-meshservice.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend_svc_80
     type: EDS

diff --git a/.../plugin/v1alpha1/testdata/default-route-outbound-with-tags-with-mtls.clusters.golden.yaml b/.../plugin/v1alpha1/testdata/default-route-outbound-with-tags-with-mtls.clusters.golden.yaml
@@ -0,0 +1,40 @@
+resources:
+- name: backend-c72efb5be46fae6b
+  resource:
+    '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
+    edsClusterConfig:
+      edsConfig:
+        ads: {}
+        initialFetchTimeout: 0s
+        resourceApiVersion: V3
+    name: backend-c72efb5be46fae6b
+    transportSocket:
+      name: envoy.transport_sockets.tls
+      typedConfig:
+        '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
+        commonTlsContext:
+          alpnProtocols:
+          - kuma
+          combinedValidationContext:
+            defaultValidationContext:
+              matchTypedSubjectAltNames:
+              - matcher:
+                  exact: spiffe://default/backend
+                sanType: URI
+            validationContextSdsSecretConfig:
+              name: mesh_ca:secret:default
+              sdsConfig:
+                ads: {}
+                resourceApiVersion: V3
+          tlsCertificateSdsSecretConfigs:
+          - name: identity_cert:secret:default
+            sdsConfig:
+              ads: {}
+              resourceApiVersion: V3
+        sni: backend{mesh=default,region=us}
+    type: EDS
+    typedExtensionProtocolOptions:
+      envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
+        '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
+        explicitHttpConfig:
+          http2ProtocolOptions: {}
diff --git a/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route.clusters.golden.yaml b/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ugin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.clusters.golden.yaml b/...ugin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.clusters.golden.yaml
@@ -6,6 +6,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-348a834721ead661
     perConnectionBufferLimitBytes: 32768
@@ -24,6 +25,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-6d0a1cf7605e8b1e
     perConnectionBufferLimitBytes: 32768
@@ -42,6 +44,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-a285094d9b0d7032
     perConnectionBufferLimitBytes: 32768
@@ -60,6 +63,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-dda53ef9426194b2
     perConnectionBufferLimitBytes: 32768
@@ -78,6 +82,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-ed49e74a1f66b25c
     perConnectionBufferLimitBytes: 32768
@@ -96,6 +101,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-wild-aac0221a73d6116a
     perConnectionBufferLimitBytes: 32768
@@ -114,6 +120,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-wild-dev-52ee11d917faac3e
     perConnectionBufferLimitBytes: 32768

diff --git a/...gin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.listeners.golden.yaml b/...gin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.listeners.golden.yaml
@@ -43,6 +43,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8080:*
           requestHeadersTimeout: 0.500s
@@ -101,6 +102,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8081:*
           requestHeadersTimeout: 0.500s
@@ -159,6 +161,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8082:*
           requestHeadersTimeout: 0.500s
@@ -221,6 +224,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTPS:8083:*.secure.dev
           requestHeadersTimeout: 0.500s
@@ -283,6 +287,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTPS:8083:*.super-secure.dev
           requestHeadersTimeout: 0.500s

diff --git a/...ies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.clusters.golden.yaml b/...ies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.clusters.golden.yaml
@@ -6,6 +6,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-26cb64fa4e85e7b7
     perConnectionBufferLimitBytes: 32768

diff --git a/...es/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml b/...es/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml
@@ -43,6 +43,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8080:*
           requestHeadersTimeout: 0.500s
@@ -101,6 +102,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8081:*
           requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.clusters.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.clusters.golden.yaml
@@ -6,6 +6,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-26cb64fa4e85e7b7
     perConnectionBufferLimitBytes: 32768

diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml
@@ -43,6 +43,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8080:*
           requestHeadersTimeout: 0.500s
@@ -101,6 +102,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8081:*
           requestHeadersTimeout: 0.500s
@@ -159,6 +161,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8082:*
           requestHeadersTimeout: 0.500s

diff --git a/...plugins/policies/meshhttproute/plugin/v1alpha1/testdata/grpc-service.clusters.golden.yaml b/...plugins/policies/meshhttproute/plugin/v1alpha1/testdata/grpc-service.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/headers-match.clusters.golden.yaml b/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/headers-match.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/match-priority.clusters.golden.yaml b/...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/match-priority.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/.../meshhttproute/plugin/v1alpha1/testdata/mixed-tcp-and-http-outbounds.clusters.golden.yaml b/.../meshhttproute/plugin/v1alpha1/testdata/mixed-tcp-and-http-outbounds.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...cies/meshhttproute/plugin/v1alpha1/testdata/request-header-modifiers.clusters.golden.yaml b/...cies/meshhttproute/plugin/v1alpha1/testdata/request-header-modifiers.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-mirror.clusters.golden.yaml b/...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-mirror.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS
@@ -19,6 +20,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: payments-9f43ffb3c22f8c19
     type: EDS

diff --git a/...ins/policies/meshhttproute/plugin/v1alpha1/testdata/request-redirect.clusters.golden.yaml b/...ins/policies/meshhttproute/plugin/v1alpha1/testdata/request-redirect.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ies/meshhttproute/plugin/v1alpha1/testdata/response-header-modifiers.clusters.golden.yaml b/...ies/meshhttproute/plugin/v1alpha1/testdata/response-header-modifiers.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/url-rewrite.clusters.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/url-rewrite.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ns/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.clusters.golden.yaml b/...ns/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
@@ -5,6 +5,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend

diff --git a/...ies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.clusters.golden.yaml b/...ies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.clusters.golden.yaml
@@ -6,6 +6,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RING_HASH
     name: backend-d230d75c0fcb71dc

diff --git a/...es/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml b/...es/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml
@@ -43,6 +43,7 @@ resources:
           rds:
             configSource:
               ads: {}
+              initialFetchTimeout: 0s
               resourceApiVersion: V3
             routeConfigName: sample-gateway:HTTP:8080:*
           requestHeadersTimeout: 0.500s

diff --git a/...s/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress.clusters.golden.yaml b/...s/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress.clusters.golden.yaml
@@ -6,6 +6,7 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
+        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: mesh-1:eds-cluster
     type: EDS