Update envoy docker image used in integration tests (envoyproxy#223)

Signed-off-by: rulex123 <[email protected]>

Author: rulex123

server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java

@@ -13,8 +13,6 @@ class EnvoyContainer extends GenericContainer<EnvoyContainer> {
   private static final Logger LOGGER = LoggerFactory.getLogger(EnvoyContainer.class);
 
   private static final String CONFIG_DEST = "/etc/envoy/envoy.yaml";
-  private static final String HOST_IP_SCRIPT = "docker/host_ip.sh";
-  private static final String HOST_IP_SCRIPT_DEST = "/usr/local/bin/host_ip.sh";
   private static final String LAUNCH_ENVOY_SCRIPT = "envoy/launch_envoy.sh";
   private static final String LAUNCH_ENVOY_SCRIPT_DEST = "/usr/local/bin/launch_envoy.sh";
 
@@ -26,7 +24,7 @@ class EnvoyContainer extends GenericContainer<EnvoyContainer> {
   EnvoyContainer(String config, Supplier<Integer> controlPlanePortSupplier) {
     // this version is changed automatically by /tools/update-sha.sh:57
     // if you change it make sure to reflect changes there
-    super("envoyproxy/envoy-alpine-dev:af50070ee60866874b0a9383daf9364e884ded22");
+    super("envoyproxy/envoy-dev:af50070ee60866874b0a9383daf9364e884ded22");
     this.config = config;
     this.controlPlanePortSupplier = controlPlanePortSupplier;
   }
@@ -35,12 +33,13 @@ class EnvoyContainer extends GenericContainer<EnvoyContainer> {
   protected void configure() {
     super.configure();
 
-    withClasspathResourceMapping(HOST_IP_SCRIPT, HOST_IP_SCRIPT_DEST, BindMode.READ_ONLY);
     withClasspathResourceMapping(LAUNCH_ENVOY_SCRIPT, LAUNCH_ENVOY_SCRIPT_DEST, BindMode.READ_ONLY);
     withClasspathResourceMapping(config, CONFIG_DEST, BindMode.READ_ONLY);
 
+    withExtraHost("host.docker.internal","host-gateway");
+
     withCommand(
-        "/bin/sh", "/usr/local/bin/launch_envoy.sh",
+        "/bin/bash", "/usr/local/bin/launch_envoy.sh",
         Integer.toString(controlPlanePortSupplier.get()),
         CONFIG_DEST,
         "-l", "debug"
@@ -55,4 +54,5 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
 
     super.containerIsStarting(containerInfo);
   }
+
 }

server/src/test/java/io/envoyproxy/controlplane/server/V3DiscoveryServerAdsIT.java

@@ -13,6 +13,7 @@
 import io.restassured.http.ContentType;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;

server/src/test/resources/docker/host_ip.sh

@@ -21,14 +21,15 @@ node:
 static_resources:
   clusters:
   - connect_timeout: 1s
+    type: STRICT_DNS
     load_assignment:
       cluster_name: ads_server
       endpoints:
         - lb_endpoints:
           - endpoint:
               address:
                 socket_address:
-                  address: HOST_IP
+                  address: host.docker.internal
                   port_value: HOST_PORT
     http2_protocol_options: {}
     name: ads_cluster

server/src/test/resources/envoy/ads.v3.config.yaml

@@ -1,15 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
-HOST_IP=$(sh /usr/local/bin/host_ip.sh)
 HOST_PORT=$1
 
 CONFIG=$(cat $2)
 CONFIG_DIR=$(mktemp -d)
 CONFIG_FILE="$CONFIG_DIR/envoy.yaml"
 
-echo "${CONFIG}" | sed -e "s/HOST_IP/${HOST_IP}/g" -e "s/HOST_PORT/${HOST_PORT}/g" > "${CONFIG_FILE}"
+echo "${CONFIG}" | sed -e "s/HOST_PORT/${HOST_PORT}/g" > "${CONFIG_FILE}"
 cat "${CONFIG_FILE}"
 
 shift 2

server/src/test/resources/envoy/launch_envoy.sh

@@ -25,14 +25,15 @@ node:
 static_resources:
   clusters:
   - connect_timeout: 1s
+    type: STRICT_DNS
     load_assignment:
       cluster_name: xds_cluster
       endpoints:
         - lb_endpoints:
             - endpoint:
                 address:
                   socket_address:
-                    address: HOST_IP
+                    address: host.docker.internal
                     port_value: HOST_PORT
     http2_protocol_options: {}
     name: xds_cluster

server/src/test/resources/envoy/xds.v3.config.yaml

@@ -59,7 +59,7 @@ UDPA_SHA=\"$UDPA_SHA\"  # $UDPA_DATE
 "
 
 # replace version in EnvoyContainer.java
-sed -i 's/\(envoy-alpine-dev:\).*\(\");\)/\1'"$ENVOY_VERSION"'\2/g'  ../server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
+sed -i 's/\(envoy-dev:\).*\(\");\)/\1'"$ENVOY_VERSION"'\2/g'  ../server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
 
 # update tag in envoy_release file
 echo $1 > enovy_release