Skip to content

Commit a3d569a

Browse files
committed
kind: rely on --force when removing containers and networks
To not return an error status code if they don't exist. Signed-off-by: Jaime Caamaño Ruiz <[email protected]>
1 parent cca01b1 commit a3d569a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

contrib/kind-common

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,15 @@ EOF
169169
# Override GOBIN until https://github.com/metallb/metallb/issues/2218 is fixed.
170170
GOBIN="" inv dev-env -n ovn -b frr -p bgp -i "${ip_family}"
171171

172-
docker network rm clientnet || true
172+
docker network rm -f clientnet
173173
docker network create --subnet="${METALLB_CLIENT_NET_SUBNET_IPV4}" ${ipv6_network} --driver bridge clientnet
174174
docker network connect clientnet frr
175175
if [ "$KIND_IPV6_SUPPORT" == true ]; then
176176
# Enable IPv6 forwarding in FRR
177177
docker exec frr sysctl -w net.ipv6.conf.all.forwarding=1
178178
fi
179179
# Note: this image let's us use it also for creating load balancer backends that can send big packets
180-
docker rm -f lbclient || true
180+
docker rm -f lbclient
181181
docker run --cap-add NET_ADMIN --user 0 -d --network clientnet --rm --name lbclient quay.io/itssurya/dev-images:metallb-lbservice
182182
popd
183183
delete_metallb_dir
@@ -730,8 +730,8 @@ deploy_bgp_external_server() {
730730
ip_family="ipv4"
731731
ipv6_network=""
732732
fi
733-
docker rm -f bgpserver || true
734-
docker network rm bgpnet || true
733+
docker rm -f bgpserver
734+
docker network rm -f bgpnet
735735
docker network create --subnet="${BGP_SERVER_NET_SUBNET_IPV4}" ${ipv6_network} --driver bridge bgpnet
736736
docker network connect bgpnet frr
737737
docker run --cap-add NET_ADMIN --user 0 -d --network bgpnet --rm --name bgpserver -p 8080:8080 registry.k8s.io/e2e-test-images/agnhost:2.45 netexec

0 commit comments

Comments
 (0)