Add network mode settings to run-container.sh

This change adds an optional -n parameter to run-container.sh allowing
to set network settings consumed by a `--network` parameter of the
`docker run` command responsible for creating the TNF container.
The network mode defaults to `bridge`, consistent with the equivalent
setting provided by the `docker run` command.

The documentation, and the usage prompt have been updated to explain
the usage of the -n parameter.

Due to the increase in the number of options available, the list of
optional arguments in the documentation is now sorted alphabetically.

Signed-off-by: Marek Kochanowski <[email protected]>

Author: mkochanowski

README.md

@@ -22,8 +22,9 @@ To pull the latest container and run the tests you use the following command. Th
 
 Optional arguments are:
 
-* `-k` gives a path to one or more kubeconfig files to be used by the container to authenticate with the cluster. Paths must be separated by a colon.
 * `-i` gives a name to a custom TNF container image. Supports local images, as well as images from external registries.
+* `-k` gives a path to one or more kubeconfig files to be used by the container to authenticate with the cluster. Paths must be separated by a colon.
+* `-n` gives the network mode of the container. Defaults to `bridge`. See the [docker run --network parameter reference](https://docs.docker.com/engine/reference/run/#network-settings) for more information on how to configure network settings.
 
 If `-k` is not specified, autodiscovery is performed.
 The autodiscovery first looks for paths in the `$KUBECONFIG` environment variable on the host system, and if the variable is not set or is empty, the default configuration stored in `$HOME/.kube/config` is checked.

run-container.sh

@@ -27,20 +27,24 @@ TNF_OFFICIAL_IMAGE="${TNF_OFFICIAL_ORG}${TNF_IMAGE_NAME}:${TNF_IMAGE_TAG}"
 
 CONTAINER_TNF_DIR=/usr/tnf
 CONTAINER_TNF_KUBECONFIG_FILE_BASE_PATH="$CONTAINER_TNF_DIR/kubeconfig/config"
+CONTAINER_DEFAULT_NETWORK_MODE=bridge
 
 usage() {
 	read -d '' usage_prompt <<- EOF
-	Usage: $0 -t TNFCONFIG -o OUTPUT_LOC [ -k KUBECONFIG ] [-i IMAGE ] SUITE [ ... SUITE ]
+	Usage: $0 -t TNFCONFIG -o OUTPUT_LOC [-i IMAGE] [-k KUBECONFIG] [-n NETWORK_MODE] SUITE [... SUITE]
 
 	Configure and run the containerised TNF test offering.
 
-	Options
+	Options (required)
 	  -t: set the directory containing TNF config files set up for the test.
 	  -o: set the output location for the test results.
+
+	Options (optional)
+	  -i: set the TNF container image. Supports local images, as well as images from external registries.
 	  -k: set path to one or more local kubeconfigs, separated by a colon.
 	      The -k option takes precedence, overwriting the results of local kubeconfig autodiscovery.
 	      See the 'Kubeconfig lookup order' section below for more details.
-	  -i: set the TNF container image. Supports local images, as well as images from external registries.
+	  -n: set the network mode of the container.
 
 	Kubeconfig lookup order
 	  1. If -k is specified, use the paths provided with the -k option.
@@ -185,6 +189,12 @@ while [[ $1 == -* ]]; do
             echo "-i requires an argument" 1>&2
             exit 1
           fi ;;
+      -n) if (($# > 1)); then
+            CONTAINER_NETWORK_MODE=$2; shift 2
+          else
+            echo "-n requires an argument" 1>&2
+            exit 1
+          fi ;;
       --) shift; break;;
       -*) echo "invalid option: $1" 1>&2; usage_error;;
     esac
@@ -210,6 +220,7 @@ for local_path_index in "${!local_kubeconfig_paths[@]}"; do
 done
 
 TNF_IMAGE="${TNF_IMAGE:-$TNF_OFFICIAL_IMAGE}"
+CONTAINER_NETWORK_MODE="${CONTAINER_NETWORK_MODE:-$CONTAINER_DEFAULT_NETWORK_MODE}"
 
 display_config_summary
 
@@ -221,6 +232,7 @@ container_tnf_kubeconfig_volumes_cmd_args=$(printf -- "-v %s " "${container_tnf_
 
 set -x
 docker run --rm \
+	--network $CONTAINER_NETWORK_MODE \
 	${container_tnf_kubeconfig_volumes_cmd_args[@]} \
 	-v $LOCAL_TNF_CONFIG:$CONTAINER_TNF_DIR/config \
 	-v $OUTPUT_LOC:$CONTAINER_TNF_DIR/claim \