From 79ded114a491660cc785f6441a89a5c363d96bb0 Mon Sep 17 00:00:00 2001 From: "jan.kozlowski" Date: Tue, 25 Jun 2024 12:01:50 +0200 Subject: [PATCH] fix OutlierDetectionTest --- .../servicemesh/envoycontrol/OutlierDetectionTest.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/OutlierDetectionTest.kt b/envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/OutlierDetectionTest.kt index 9445320a7..c250b4e0d 100644 --- a/envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/OutlierDetectionTest.kt +++ b/envoy-control-tests/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/OutlierDetectionTest.kt @@ -6,6 +6,7 @@ import org.junit.jupiter.api.extension.RegisterExtension import pl.allegro.tech.servicemesh.envoycontrol.assertions.isFrom import pl.allegro.tech.servicemesh.envoycontrol.assertions.isOk import pl.allegro.tech.servicemesh.envoycontrol.assertions.untilAsserted +import pl.allegro.tech.servicemesh.envoycontrol.config.RandomConfigFile import pl.allegro.tech.servicemesh.envoycontrol.config.consul.ConsulExtension import pl.allegro.tech.servicemesh.envoycontrol.config.service.EchoServiceExtension import pl.allegro.tech.servicemesh.envoycontrol.config.envoy.EnvoyExtension @@ -33,9 +34,18 @@ class OutlierDetectionTest { @RegisterExtension val unhealthyService = EchoServiceExtension() + // necessary since Envoy 1.28.0 to keep the same behaviour (https://www.envoyproxy.io/docs/envoy/latest/version_history/v1.28/v1.28.0) + private val outlierEjectionConfig = """ + layered_runtime: + layers: + - name: static_layer + static_layer: + envoy.reloadable_features.check_mep_on_first_eject: false + """.trimIndent() + @JvmField @RegisterExtension - val envoy = EnvoyExtension(envoyControl) + val envoy = EnvoyExtension(envoyControl, config = RandomConfigFile.copy(configOverride = outlierEjectionConfig)) } @Test