From e2592d130a22a160dbe92c326404c9c6c0ee5fac Mon Sep 17 00:00:00 2001 From: Hubert Grochowski <hubert.grochowski@saucelabs.com> Date: Mon, 6 May 2024 13:38:07 +0200 Subject: [PATCH] e2e: change static IPs in dns test As observed in a few CI runs[1] assigning private addresses might result in an overlap with randomly generated networks. Both Podman and Docker assign private addresses (10.0.0.0, 172.16.0.0, 192.168.0.0) when the network is not specified. This patch changes static IP addresses in dns setups to non-private to minimize the chance of collision. [1] https://github.com/saucelabs/forwarder/actions/runs/8896336713/job/24428757815 --- e2e/dns/db.rpz | 2 +- e2e/setups.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/e2e/dns/db.rpz b/e2e/dns/db.rpz index ae1bad3b..e5588e6d 100644 --- a/e2e/dns/db.rpz +++ b/e2e/dns/db.rpz @@ -7,4 +7,4 @@ $TTL 60 30m) ; minimum IN NS localhost. -httpbin.local A 192.168.100.10 +httpbin.local A 150.150.100.10 diff --git a/e2e/setups.go b/e2e/setups.go index 9af9c07e..427b7565 100644 --- a/e2e/setups.go +++ b/e2e/setups.go @@ -245,10 +245,10 @@ func SetupFlagDNSServer(l *setupList) { const ( networkName = "internal" - dnsIPAddr = "192.168.100.2" - invalidDNSIPAddr = "192.168.100.3" - httpbinIPAddr = "192.168.100.10" - proxyIPAddr = "192.168.100.11" + dnsIPAddr = "150.150.100.2" + invalidDNSIPAddr = "150.150.100.3" + httpbinIPAddr = "150.150.100.10" + proxyIPAddr = "150.150.100.11" ) for _, s := range []struct { name string @@ -282,9 +282,9 @@ func SetupFlagDNSServer(l *setupList) { IPAM: compose.IPAM{ Config: []compose.IPAMConfig{ { - Subnet: "192.168.100.0/24", - Gateway: "192.168.100.1", - IPRange: "192.168.100.10/29", + Subnet: "150.150.100.0/24", + Gateway: "150.150.100.1", + IPRange: "150.150.100.10/29", }, }, },