Skip to content

Update integration tests to use host.testcontainers.internal #303

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update integration tests to use host.testcontainers.internal #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions server/src/test/java/io/envoyproxy/controlplane/server/EnvoyContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.function.Supplier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.Testcontainers;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
Expand Down Expand Up @@ -36,11 +37,11 @@ protected void configure() {
withClasspathResourceMapping(LAUNCH_ENVOY_SCRIPT, LAUNCH_ENVOY_SCRIPT_DEST, BindMode.READ_ONLY);
withClasspathResourceMapping(config, CONFIG_DEST, BindMode.READ_ONLY);

withExtraHost("host.docker.internal","host-gateway");

final Integer controlPlanePort = controlPlanePortSupplier.get();
Testcontainers.exposeHostPorts(controlPlanePort);
withCommand(
"/bin/bash", "/usr/local/bin/launch_envoy.sh",
Integer.toString(controlPlanePortSupplier.get()),
Integer.toString(controlPlanePort),
CONFIG_DEST,
"-l", "debug"
);
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/resources/envoy/ads.v3.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static_resources:
- endpoint:
address:
socket_address:
address: host.docker.internal
address: host.testcontainers.internal
port_value: HOST_PORT
http2_protocol_options: {}
name: ads_cluster
2 changes: 1 addition & 1 deletion server/src/test/resources/envoy/ads.v3.delta.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ static_resources:
- endpoint:
address:
socket_address:
address: host.docker.internal
address: host.testcontainers.internal
port_value: HOST_PORT
http2_protocol_options: {}
name: ads_cluster
2 changes: 1 addition & 1 deletion server/src/test/resources/envoy/xds.v3.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static_resources:
- endpoint:
address:
socket_address:
address: host.docker.internal
address: host.testcontainers.internal
port_value: HOST_PORT
http2_protocol_options: {}
name: xds_cluster
2 changes: 1 addition & 1 deletion server/src/test/resources/envoy/xds.v3.delta.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static_resources:
- endpoint:
address:
socket_address:
address: host.docker.internal
address: host.testcontainers.internal
port_value: HOST_PORT
http2_protocol_options: {}
name: xds_cluster