do not create endpoints resource when the endpoints array is empty.

hashicorp · Nov 7, 2023 · 11701af · 11701af
1 parent 2e4d96f
commit 11701af
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/agent/xds/endpoints.go b/agent/xds/endpoints.go
@@ -784,6 +784,11 @@ func (s *ResourceGenerator) endpointsFromDiscoveryChain(
 				continue // skip the cluster if we're still populating the snapshot
 			}
 
+			if len(endpointGroup.Endpoints) == 0 {
+				s.Logger.Trace("skipping endpoint generation because no endpoints found for target group", "cluster", clusterName)
+				continue // skip the cluster if we're still populating the snapshot
+			}
+
 			la := makeLoadAssignment(
 				s.Logger,
 				cfgSnap,

diff --git a/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-tproxy.latest.golden b/agent/xds/testdata/builtin_extension/endpoints/lambda-connect-proxy-tproxy.latest.golden
@@ -90,13 +90,6 @@
           ]
         }
       ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",

diff --git a/agent/xds/testdata/endpoints/transparent-proxy.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy.latest.golden
@@ -90,13 +90,6 @@
           ]
         }
       ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
     }
   ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",