Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cp identifier in response #305

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Cp identifier in response #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
134a655
add control-plane identifier in response
Mar 4, 2022
0510d33
fix detekt
gawarz Mar 4, 2022
cde53e5
add method in builder
gawarz Mar 4, 2022
b3f8e88
Merge branch 'master' into cp-identifier-in-response
gawarz Apr 4, 2022
af6689c
fix ktlint
gawarz Apr 4, 2022
bfac13e
Merge remote-tracking branch 'origin/master' into cp-identifier-in-re…
Ferdudas97 Jun 29, 2022
c39ec6a
get controlPlaneIdentifier from env
Ferdudas97 Jun 30, 2022
d836f03
update changelog
Ferdudas97 Jun 30, 2022
6320a37
remove System.getProperty
Ferdudas97 Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/ControlPlane.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ class ControlPlane private constructor(
compositeDiscoveryServerCallbacks,
groupChangeWatcher,
executorGroup,
cachedProtoResourcesSerializer
cachedProtoResourcesSerializer,
properties.envoy.controlPlaneIdentifier
)
}

Expand Down
2 changes: 2 additions & 0 deletions ...l-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/EnvoyControlProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -15,6 +16,7 @@ class EnvoyControlProperties {

class EnvoyProperties {
var snapshot = SnapshotProperties()
var controlPlaneIdentifier = UUID.randomUUID().toString()
}

class ServiceFilters {
Expand Down