Remove ApiVersion.V3 from RDS

allegro · Sep 25, 2020 · 430508c · 430508c
1 parent 4779973
commit 430508c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.../kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/CachedProtoResourcesSerializer.kt b/.../kotlin/pl/allegro/tech/servicemesh/envoycontrol/server/CachedProtoResourcesSerializer.kt
@@ -39,13 +39,13 @@ internal class CachedProtoResourcesSerializer(
     }
 
     override fun serialize(
-            resources: MutableCollection<out Message>,
-            apiVersion: Resources.ApiVersion
+        resources: MutableCollection<out Message>,
+        apiVersion: Resources.ApiVersion
     ): MutableCollection<Any> = serializeTimer.record(Supplier { getResources(resources, apiVersion) })
 
     private fun getResources(
-            resources: MutableCollection<out Message>,
-            apiVersion: Resources.ApiVersion
+        resources: MutableCollection<out Message>,
+        apiVersion: Resources.ApiVersion
     ): MutableCollection<Any> {
         return cache.get(resources) {
             resources.asSequence()

diff --git a/...llegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/EnvoyListenersFactory.kt b/...llegro/tech/servicemesh/envoycontrol/snapshot/resource/listeners/EnvoyListenersFactory.kt
@@ -12,7 +12,6 @@ import io.envoyproxy.envoy.config.accesslog.v3.StatusCodeFilter
 import io.envoyproxy.envoy.config.core.v3.Address
 import io.envoyproxy.envoy.config.core.v3.AggregatedConfigSource
 import io.envoyproxy.envoy.config.core.v3.ApiConfigSource
-import io.envoyproxy.envoy.config.core.v3.ApiVersion
 import io.envoyproxy.envoy.config.core.v3.ConfigSource
 import io.envoyproxy.envoy.config.core.v3.GrpcService
 import io.envoyproxy.envoy.config.core.v3.Http1ProtocolOptions
@@ -255,7 +254,6 @@ class EnvoyListenersFactory(
 
     private fun egressRds(communicationMode: CommunicationMode): Rds {
         val configSource = ConfigSource.newBuilder()
-                .setResourceApiVersion(ApiVersion.V3)
                 .setInitialFetchTimeout(egressRdsInitialFetchTimeout)
 
         when (communicationMode) {
@@ -309,7 +307,6 @@ class EnvoyListenersFactory(
 
     private fun ingressRds(communicationMode: CommunicationMode): Rds {
         val configSource = ConfigSource.newBuilder()
-                .setResourceApiVersion(ApiVersion.V3)
                 .setInitialFetchTimeout(ingressRdsInitialFetchTimeout)
 
         when (communicationMode) {