Merge pull request #814 from runcom/cache-ip-sandbox

cache sandbox's IP address

test/helpers.bash

@@ -407,8 +407,18 @@ function prepare_plugin_test_args_network_conf() {
 	cat >$CRIO_CNI_CONFIG/10-plugin-test-args.conf <<-EOF
 {
     "cniVersion": "0.2.0",
-    "name": "crionet",
-    "type": "plugin_test_args.bash"
+    "name": "crionet_test_args",
+    "type": "bridge-custom",
+    "bridge": "cni0",
+    "isGateway": true,
+    "ipMasq": true,
+    "ipam": {
+        "type": "host-local",
+        "subnet": "$1",
+        "routes": [
+            { "dst": "0.0.0.0/0"  }
+        ]
+    }
 }
 EOF
 

test/kpod_logs.bats

@@ -5,7 +5,7 @@ load helpers
 IMAGE="alpine:latest"
 ROOT="$TESTDIR/crio"
 RUNROOT="$TESTDIR/crio-run"
-KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT $STORAGE_OPTS"
+KPOD_OPTIONS="--root $ROOT --runroot $RUNROOT ${STORAGE_OPTS}"
 
 function teardown() {
     cleanup_test

test/network.bats

@@ -85,6 +85,8 @@ load helpers
 	[ "$FOUND_K8S_POD_NAMESPACE" = "redhat.test.crio" ]
 	[ "$FOUND_K8S_POD_NAME" = "podsandbox1" ]
 
+	rm -rf /tmp/plugin_test_args.out
+
 	cleanup_pods
 	stop_crio
 }

test/plugin_test_args.bash

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-if [[ -z "${CNI_ARGS}" ]]; then
-	exit 1
-fi
-
-IFS=';' read -ra array <<< "${CNI_ARGS}"
-for arg in "${array[@]}"; do
-	IFS='=' read -ra item <<< "${arg}"
-	if [[ "${item[0]}" = "K8S_POD_NAMESPACE" ]]; then
-		K8S_POD_NAMESPACE="${item[1]}"
-	elif [[ "${item[0]}" = "K8S_POD_NAME" ]]; then
-		K8S_POD_NAME="${item[1]}"
-	fi
-done
-
-if [[ -z "${CNI_CONTAINERID}" ]]; then
-	exit 1
-elif [[ -z "${K8S_POD_NAMESPACE}" ]]; then
-	exit 1
-elif [[ -z "${K8S_POD_NAME}" ]]; then
-	exit 1
-fi
-
-echo "FOUND_CNI_CONTAINERID=${CNI_CONTAINERID}" >> /tmp/plugin_test_args.out
-echo "FOUND_K8S_POD_NAMESPACE=${K8S_POD_NAMESPACE}" >> /tmp/plugin_test_args.out
-echo "FOUND_K8S_POD_NAME=${K8S_POD_NAME}" >> /tmp/plugin_test_args.out
-
-cat <<-EOF
-{
-  "cniVersion": "0.2.0",
-  "ip4": {
-    "ip": "1.1.1.1/24"
-  }
-}
-EOF
-