diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a949ab4d..aa4d8787d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Changed +- control plane identifier added + ## [0.19.10] ### Changed diff --git a/build.gradle b/build.gradle index 55161d172..61a988217 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ allprojects { project.ext.versions = [ kotlin : '1.6.10', - java_controlplane : '0.1.28', + java_controlplane : '0.1.31-control-plane-identifier-SNAPSHOT', spring_boot : '2.3.4.RELEASE', grpc : '1.21.0', jaxb : '2.3.1', diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt index c44725443..574e69f5f 100644 --- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt +++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt @@ -224,7 +224,8 @@ class ControlPlane private constructor( compositeDiscoveryServerCallbacks, groupChangeWatcher, executorGroup, - cachedProtoResourcesSerializer + cachedProtoResourcesSerializer, + properties.envoy.controlPlaneIdentifier ) } diff --git a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt index e328ac8ba..0a4ad507d 100644 --- a/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt +++ b/envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt @@ -5,6 +5,7 @@ package pl.allegro.tech.servicemesh.envoycontrol import pl.allegro.tech.servicemesh.envoycontrol.server.ServerProperties import pl.allegro.tech.servicemesh.envoycontrol.snapshot.SnapshotProperties import pl.allegro.tech.servicemesh.envoycontrol.synchronization.SyncProperties +import java.util.UUID class EnvoyControlProperties { var server = ServerProperties() @@ -15,6 +16,7 @@ class EnvoyControlProperties { class EnvoyProperties { var snapshot = SnapshotProperties() + var controlPlaneIdentifier = UUID.randomUUID().toString() } class ServiceFilters {