Merge branch 'java-control-plane-1.0.45' into paths-support

CHANGELOG.md

@@ -5,9 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [0.21.0]
 ### Changed
-- Updated `io.envoyproxy.controlplane` to `1.0.45`
 - Added `paths` field in API to support Glob Patterns
 
+## [0.20.15]
+### Changed
+- Java-control-plane update to 1.0.45
+
 ## [0.20.14]
 ### Changed
 - Added test to check circuit breaker metric value

envoy-control-core/src/main/kotlin/pl/allegro/tech/servicemesh/envoycontrol/groups/GroupChangeWatcher.kt

@@ -52,8 +52,14 @@ internal class GroupChangeWatcher(
     ): Watch {
         val oldGroups = cache.groups()
 
-        val watch = cache.createWatch(ads, request, knownResourceNames, responseConsumer, hasClusterChanged,
-            allowDefaultEmptyEdsUpdate)
+        val watch = cache.createWatch(
+            ads,
+            request,
+            knownResourceNames,
+            responseConsumer,
+            hasClusterChanged,
+            allowDefaultEmptyEdsUpdate
+        )
         val groups = cache.groups()
         metrics.setCacheGroupsCount(groups.size)
         if (oldGroups != groups) {

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

tools/envoy/Dockerfile

@@ -1,4 +1,4 @@
-FROM envoyproxy/envoy:v1.24.0
+FROM envoyproxy/envoy:v1.30.4
 
 ENV PORT=9999:9999
 ENV PORT=80:80