From 3f928ae2af5b11acfaddd779c497771e83004912 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Mon, 11 Jan 2021 10:52:48 -0500
Subject: [PATCH] Refining pulling and loading logic

---
 .../run.sh                                    | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/spring-cloud-kubernetes-integration-tests/run.sh b/spring-cloud-kubernetes-integration-tests/run.sh
index 7c139337..4a8feea0 100755
--- a/spring-cloud-kubernetes-integration-tests/run.sh
+++ b/spring-cloud-kubernetes-integration-tests/run.sh
@@ -30,10 +30,16 @@ ALL_INTEGRATION_PROJECTS=(
 INTEGRATION_PROJECTS=(${INTEGRATION_PROJECTS:-${ALL_INTEGRATION_PROJECTS[@]}})
 
 DEFAULT_PULLING_IMAGES=(
-	"docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:${MVN_VERSION}"
+	"jettech/kube-webhook-certgen:v1.2.2"
+	"rabbitmq:3-management"
+	"zookeeper:3.6.2"
+	"rodolpheche/wiremock:2.27.2"
+	"wurstmeister/kafka:2.13-2.6.0"
 )
 PULLING_IMAGES=(${PULLING_IMAGES:-${DEFAULT_PULLING_IMAGES[@]}})
 
+LOADING_IMAGES=(${LOADING_IMAGES:-${DEFAULT_PULLING_IMAGES[@]}} "docker.io/springcloud/spring-cloud-kubernetes-configuration-watcher:${MVN_VERSION}")
+
 CURRENT_DIR="$(pwd)"
 
 # cleanup on exit (useful for running locally)
@@ -86,17 +92,15 @@ main() {
     kubectl cluster-info --context kind-kind
 
 	#setup nginx ingress
-	# Pull this image to avoid DockerHub limits when running on Jenkins
-	docker pull jettech/kube-webhook-certgen:v1.2.2
-	docker pull rabbitmq:3-management
-	docker pull zookeeper:3.6.2
-	docker pull rodolpheche/wiremock
-	docker pull wurstmeister/kafka:2.13-2.6.0
-    "${KIND}" load docker-image jettech/kube-webhook-certgen:v1.2.2
-    "${KIND}" load docker-image rabbitmq:3-management
-    "${KIND}" load docker-image zookeeper:3.6.2
-    "${KIND}" load docker-image rodolpheche/wiremock
-    "${KIND}" load docker-image wurstmeister/kafka:2.13-2.6.0
+	# pulling necessary images for setting up the integration test environment
+	for i in "${PULLING_IMAGES[@]}"; do
+		echo "Pull images for prepping testing environment: $i"
+		docker pull $i
+	done
+	for i in "${LOADING_IMAGES[@]}"; do
+		echo "Loading images into Kind: $i"
+		"${KIND}" load docker-image $i
+	done
 #    kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/kind/deploy.yaml
     kubectl apply -fhttps://raw.githubusercontent.com/kubernetes/ingress-nginx/12150e318b972a03fb49d827e6cabb8ef62247ef/deploy/static/provider/kind/deploy.yaml
     sleep 5 # hold 5 sec so that the pods can be created
@@ -113,12 +117,6 @@ main() {
 
 	cd $CURRENT_DIR
 
-	# pulling necessary images for setting up the integration test environment
-	for i in "${PULLING_IMAGES[@]}"; do
-		echo "Pull images for prepping testing environment: $i"
-#		docker pull $i
-		"${KIND}" load docker-image $i
-	done
 
 	# running tests..
 	for p in "${INTEGRATION_PROJECTS[@]}"; do