Implemented possibility for configuring traffic splitting, and fallba…

…ck using aggregate cluster #292
allegro · Aug 25, 2023 · 19714b3 · 19714b3
1 parent 1e06196
commit 19714b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 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
@@ -270,7 +270,6 @@ class EnvoySnapshotFactory(
         group: Group,
         globalSnapshot: GlobalSnapshot
     ): Snapshot {
-        logger.debug("Creating new snapshot for group ${group.serviceName}")
         // TODO(dj): This is where serious refactoring needs to be done
         val egressDomainRouteSpecifications = getDomainRouteSpecifications(group, globalSnapshot)
         val egressServiceRouteSpecification = getServiceRouteSpecifications(group, globalSnapshot)
@@ -314,7 +313,6 @@ class EnvoySnapshotFactory(
             group.proxySettings.incoming.rateLimitEndpoints, globalSnapshot,
             egressRouteSpecification
         )
-            // .also { logger.debug("Result endpoints: ${it.toString()}") }
 
         val version = snapshotsVersions.version(group, clusters, endpoints, listeners, routes)
         return createSnapshot(
@@ -327,9 +325,7 @@ class EnvoySnapshotFactory(
             listenersVersion = version.listeners,
             routes = routes,
             routesVersion = version.routes
-        ).also {
-            logger.debug("Snapshot endpoints: ${it.endpoints()}")
-        }
+        )
     }
 
     private fun createRoutesWhenUsingTransparentProxy(

diff --git a/...ro/tech/servicemesh/envoycontrol/snapshot/resource/endpoints/EnvoyEndpointsFactoryTest.kt b/...ro/tech/servicemesh/envoycontrol/snapshot/resource/endpoints/EnvoyEndpointsFactoryTest.kt
@@ -368,8 +368,8 @@ internal class EnvoyEndpointsFactoryTest {
             listOf(
                 clusterState(cluster = "DC1"),
                 clusterState(cluster = "DC2"),
-                clusterState(cluster = "DC1", sName = serviceName2),
-                clusterState(cluster = "DC2", sName = serviceName2),
+                clusterState(cluster = "DC1", serviceName = serviceName2),
+                clusterState(cluster = "DC2", serviceName = serviceName2),
             )
         )
 
@@ -398,7 +398,7 @@ internal class EnvoyEndpointsFactoryTest {
         val multiClusterState = MultiClusterState(
             listOf(
                 clusterState(cluster = defaultZone),
-                clusterState(cluster = defaultZone, sName = serviceName2),
+                clusterState(cluster = defaultZone, serviceName = serviceName2),
             )
         )
         val services = setOf(serviceName, serviceName2)
@@ -428,7 +428,7 @@ internal class EnvoyEndpointsFactoryTest {
         val multiClusterState = MultiClusterState(
             listOf(
                 clusterState(cluster = defaultZone),
-                clusterState(cluster = defaultZone, sName = serviceName2),
+                clusterState(cluster = defaultZone, serviceName = serviceName2),
             )
         )
         val services = setOf(serviceName, serviceName2)
@@ -455,7 +455,7 @@ internal class EnvoyEndpointsFactoryTest {
         val multiClusterState = MultiClusterState(
             listOf(
                 clusterState(cluster = defaultZone),
-                clusterState(cluster = defaultZone, sName = serviceName2),
+                clusterState(cluster = defaultZone, serviceName = serviceName2),
             )
         )
         val services = setOf(serviceName, serviceName2)
@@ -493,13 +493,13 @@ internal class EnvoyEndpointsFactoryTest {
     private fun clusterState(
         locality: Locality = Locality.LOCAL,
         cluster: String,
-        sName: String = serviceName
+        serviceName: String = this.serviceName
     ): ClusterState {
         return ClusterState(
             ServicesState(
                 serviceNameToInstances = concurrentMapOf(
-                    sName to ServiceInstances(
-                        sName, setOf(
+                    serviceName to ServiceInstances(
+                        serviceName, setOf(
                             ServiceInstance(
                                 id = "id",
                                 tags = setOf("envoy"),