added service name to eds config #292

allegro · Sep 18, 2023 · 75cd930 · 75cd930
1 parent 2e68b5d
commit 75cd930
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt b/...src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/snapshot/EnvoySnapshotFactory.kt
@@ -342,7 +342,7 @@ class EnvoySnapshotFactory(
             routes = routes,
             routesVersion = version.routes
         ).also {
-            logger.info("Snapshot for group: $it")
+            logger.debug("Snapshot for group: $it")
         }
     }
 

diff --git a/.../allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt b/.../allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt
@@ -242,6 +242,10 @@ class EnvoyClustersFactory(
         return Cluster.newBuilder(cluster)
             .setCommonHttpProtocolOptions(HttpProtocolOptions.newBuilder().setIdleTimeout(idleTimeoutPolicy))
             .setName(clusterName)
+            .setEdsClusterConfig(
+                Cluster.EdsClusterConfig.newBuilder(cluster.edsClusterConfig)
+                    .setServiceName(clusterName)
+            )
             .build()
             .also { logger.debug("Created regular cluster config {}", it.toString()) }
     }
@@ -481,7 +485,7 @@ class EnvoyClustersFactory(
                                         )
                                 )
                     }
-                )
+                ).setServiceName(clusterConfiguration.serviceName)
             )
             .setLbPolicy(properties.loadBalancing.policy)
             // TODO: if we want to have multiple memory-backend instances of ratelimit