Implemented possibility for configuring traffic splitting, and fallba…

…ck using aggregate cluster #292
allegro · Aug 24, 2023 · b65015c · b65015c
1 parent 2865fb2
commit b65015c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 30 deletions.
diff --git a/.../allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt b/.../allegro/tech/servicemesh/envoycontrol/snapshot/resource/clusters/EnvoyClustersFactory.kt
@@ -266,7 +266,8 @@ class EnvoyClustersFactory(
     ): Collection<Cluster> {
         return cluster?.let {
             if (enableTrafficSplitting(serviceName, cluster.name, dependencies, clusterLoadAssignment)) {
-                logger.debug("Creating traffic splitting egress cluster config for ${cluster.name}, service: $serviceName")
+                logger.debug(
+                    "Creating traffic splitting egress cluster config for ${cluster.name}, service: $serviceName")
                 createSetOfClustersForGroup(dependencySettings, cluster)
             } else {
                 listOf(createClusterForGroup(dependencySettings, cluster))

diff --git a/...ntrol-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/utils/ClusterNames.kt b/...ntrol-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/utils/ClusterNames.kt
@@ -1,9 +1,9 @@
 package pl.allegro.tech.servicemesh.envoycontrol.utils
 
-import pl.allegro.tech.servicemesh.envoycontrol.utils.ClusterConstants.AGGREGATE_CLUSTER_POSTFIX
-import pl.allegro.tech.servicemesh.envoycontrol.utils.ClusterConstants.SECONDARY_CLUSTER_POSTFIX
+import pl.allegro.tech.servicemesh.envoycontrol.utils.ClusterNames.AGGREGATE_CLUSTER_POSTFIX
+import pl.allegro.tech.servicemesh.envoycontrol.utils.ClusterNames.SECONDARY_CLUSTER_POSTFIX
 
-object ClusterConstants {
+object ClusterNames {
     const val SECONDARY_CLUSTER_POSTFIX= "secondary"
     const val AGGREGATE_CLUSTER_POSTFIX= "aggregate"
 }

diff --git a/...core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoySnapshotFactoryTest.kt b/...core/src/test/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoySnapshotFactoryTest.kt
@@ -27,12 +27,6 @@ import pl.allegro.tech.servicemesh.envoycontrol.groups.Outgoing
 import pl.allegro.tech.servicemesh.envoycontrol.groups.ProxySettings
 import pl.allegro.tech.servicemesh.envoycontrol.groups.ServicesGroup
 import pl.allegro.tech.servicemesh.envoycontrol.groups.with
-import pl.allegro.tech.servicemesh.envoycontrol.services.ClusterState
-import pl.allegro.tech.servicemesh.envoycontrol.services.Locality
-import pl.allegro.tech.servicemesh.envoycontrol.services.MultiClusterState
-import pl.allegro.tech.servicemesh.envoycontrol.services.ServiceInstance
-import pl.allegro.tech.servicemesh.envoycontrol.services.ServiceInstances
-import pl.allegro.tech.servicemesh.envoycontrol.services.ServicesState
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.ClusterConfiguration
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.EnvoySnapshotFactory
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.GlobalSnapshot
@@ -47,7 +41,6 @@ import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.routes.EnvoyEg
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.routes.EnvoyIngressRoutesFactory
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.resource.routes.ServiceTagMetadataGenerator
 import pl.allegro.tech.servicemesh.envoycontrol.snapshot.serviceDependencies
-import java.util.concurrent.ConcurrentHashMap
 
 class EnvoySnapshotFactoryTest {
     companion object {
@@ -509,25 +502,6 @@ class EnvoySnapshotFactoryTest {
         }
     }
 
-    private fun createMultiClusterState(services: List<String>): List<MultiClusterState> {
-        return services
-            .map {
-                ClusterState(
-                    ServicesState(
-                        ConcurrentHashMap(
-                            mutableMapOf(
-                                it to ServiceInstances(
-                                    it,
-                                    setOf(ServiceInstance("id", setOf(), "localhost", 8080))
-                                )
-                            )
-                        )
-                    ), Locality.LOCAL, it
-                )
-            }
-            .map { MultiClusterState(it) }
-    }
-
     private fun createCluster(
         defaultProperties: SnapshotProperties,
         clusterName: String = CLUSTER_NAME,