diff options
| author | Chris Evich <cevich@redhat.com> | 2019-08-27 12:12:28 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-08-28 09:02:31 -0400 |
| commit | e06f17f58030a925c7d175dfccd09b2b3cff55e2 (patch) | |
| tree | 3978e0ed5be79d335fb4eace2f121e6f42ad2c36 /contrib/cirrus/setup_environment.sh | |
| parent | f221c6101934fccbd6705f3b387aadc9ae710f66 (diff) | |
| download | podman-e06f17f58030a925c7d175dfccd09b2b3cff55e2.tar.gz podman-e06f17f58030a925c7d175dfccd09b2b3cff55e2.tar.bz2 podman-e06f17f58030a925c7d175dfccd09b2b3cff55e2.zip | |
Cirrus: Block CNI use of google VPCs
Specifically pertaining to executing tests in google cloud, there are
default, pre-allocated class-a subnetworks for each region (data-center).
Each includes a gateway using a `.1` LSB and all are routable from other
regions in google cloud via these gateways.
Because the default CNI configuration also utilizes class-a subnetworks,
this creates the possibility for IPv4 address-space clashes. Since the
default regional cloud subnets are pre-defined/known, preventing clashes
can be accomplished by seeding these subnets in a dummy CNI configuration.
The default behavior of podman is to grab the highest priority CNI
configuration. Name the dummy config. appropriate so it always loads
last. Also name the bridge itself with an obvious name `do-not-use`,
such that any related testing errors should be easier to debug.
Also:
* Minor cleanup of `install_test_configs()`
* Move install_test_configs in `setup_environment.sh` to after possible
run of `remove_packaged_podman_files()` because that also strips out
`/etc/cni/net.d/87-podman-bridge.conflist`.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 2579229a5..e0236a54d 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -57,8 +57,7 @@ esac # Reload to incorporate any changes from above source "$SCRIPT_BASE/lib.sh" -install_test_configs - +# Must execute before possible setup_rootless() make install.tools case "$SPECIALMODE" in @@ -93,3 +92,5 @@ case "$SPECIALMODE" in *) die 111 "Unsupported \$SPECIALMODE: $SPECIALMODE" esac + +install_test_configs |