Changed out echo server image, small edits

Author: z103cb

hack/e2e-kind-config.yaml

@@ -1,13 +1,13 @@
 # this config file contains all config fields with comments
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-# 1 control plane node and 3 workers
+# 1 control plane node and 1 workers
 nodes:
   # the control plane node config
   - role: control-plane
     # kubernetes version 1.20.7 from kind v0.11.0
     image: kindest/node:v1.20.7@sha256:e645428988191fc824529fd0bb5c94244c12401cf5f5ea3bd875eb0a787f0fe9
-  # the three workers
+  # the worker
   - role: worker
     # kubernetes version 1.20.7 from kind v0.11.0
     image: kindest/node:v1.20.7@sha256:e645428988191fc824529fd0bb5c94244c12401cf5f5ea3bd875eb0a787f0fe9

hack/run-e2e-kind.sh

@@ -27,20 +27,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/..
+export ROOT_DIR="$(dirname "$(dirname "$(readlink -fm "$0")")")"
 export LOG_LEVEL=3
-export CLEANUP_CLUSTER=${CLEANUP_CLUSTER:-1}
+export CLEANUP_CLUSTER=${CLEANUP_CLUSTER:-"true"}
 export CLUSTER_CONTEXT="--name test"
 # Using older image due to older version of kubernetes cluster"
-export IMAGE_NGINX="nginx:1.15.12"
-export IMAGE_ECHOSERVER="k8s.gcr.io/echoserver:1.4"
+export IMAGE_ECHOSERVER="kicbase/echo-server:1.0"
 export KIND_OPT=${KIND_OPT:=" --config ${ROOT_DIR}/hack/e2e-kind-config.yaml"}
 export KA_BIN=_output/bin
 export WAIT_TIME="20s"
 export IMAGE_REPOSITORY_MCAD="${1}"
 export IMAGE_TAG_MCAD="${2}"
 export MCAD_IMAGE_PULL_POLICY="${3-Always}"
 export IMAGE_MCAD="${IMAGE_REPOSITORY_MCAD}:${IMAGE_TAG_MCAD}"
+CLUSTER_STARTED="false"
 
 function update_test_host {
   sudo apt-get update && sudo apt-get install -y apt-transport-https curl 
@@ -54,7 +54,7 @@ function update_test_host {
   sudo curl -o /usr/local/bin/kind -L https://github.com/kubernetes-sigs/kind/releases/download/v0.11.0/kind-linux-amd64
   sudo chmod +x /usr/local/bin/kind
 
-   # Installing helm3
+  # Installing helm3
   curl -fsSL -o ${ROOT_DIR}/get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
   chmod 700 ${ROOT_DIR}/get_helm.sh
   ${ROOT_DIR}/get_helm.sh
@@ -65,19 +65,19 @@ function update_test_host {
 function check-prerequisites {
   echo "checking prerequisites"
   which kind >/dev/null 2>&1
-  if [[ $? -ne 0 ]]; then
+  if [ $? -ne 0 ]; then
     echo "kind not installed, exiting."
     exit 1
   else
     echo -n "found kind, version: " && kind version
   fi
 
   which kubectl >/dev/null 2>&1
-  if [[ $? -ne 0 ]]; then
+  if [ $? -ne 0 ]; then
     echo "kubectl not installed, exiting."
     exit 1
   else
-    echo -n "found kubectl, " && kubectl version --short --client
+    echo -n "found kubectl, " && kubectl version 
   fi
 
   if [[ $IMAGE_REPOSITORY_MCAD == "" ]]
@@ -93,7 +93,7 @@ function check-prerequisites {
   fi
 
   which helm >/dev/null 2>&1
-  if [[ $? -ne 0 ]]
+  if [ $? -ne 0 ]
   then
     echo "helm not installed, exiting."
     exit 1
@@ -106,43 +106,44 @@ function check-prerequisites {
 function kind-up-cluster {
   echo "Running kind: [kind create cluster ${CLUSTER_CONTEXT} ${KIND_OPT}]"
   kind create cluster ${CLUSTER_CONTEXT} ${KIND_OPT} --wait ${WAIT_TIME}
+  if [ $? -ne 0 ]
+  then
+    echo "Failed to start kind cluster"
+    exit 1
+  fi
+  CLUSTER_STARTED="true"
 
-  docker images
   docker pull ${IMAGE_ECHOSERVER}
-  docker pull ${IMAGE_NGINX}
   if [[ "$MCAD_IMAGE_PULL_POLICY" = "Always" ]]
   then
     docker pull ${IMAGE_MCAD}
   fi
   docker images
-  
-  kind load docker-image ${IMAGE_NGINX} ${CLUSTER_CONTEXT}
-  if [[ $? -ne 0 ]]
-  then
-    echo "Failed to load image ${IMAGE_NGINX} in cluster"
-    exit 1
-  fi 
-  
+    
   kind load docker-image ${IMAGE_ECHOSERVER} ${CLUSTER_CONTEXT}
-  if [[ $? -ne 0 ]]
+  if [ $? -ne 0 ]
   then
     echo "Failed to load image ${IMAGE_ECHOSERVER} in cluster"
     exit 1
   fi 
 
   kind load docker-image ${IMAGE_MCAD} ${CLUSTER_CONTEXT}
-  if [[ $? -ne 0 ]]
+  if [ $? -ne 0 ]
   then
     echo "Failed to load image ${IMAGE_MCAD} in cluster"
     exit 1
-  fi 
+  fi
 }
 
 # clean up
 function cleanup {
     echo "==========================>>>>> Cleaning up... <<<<<=========================="
     echo " "
-
+    if [[ ${CLUSTER_STARTED} == "false" ]]
+    then
+      echo "Cluster was not started, nothing more to do."
+      return
+    fi  
 
     echo "Custom Resource Definitions..."
     echo "kubectl get crds"
@@ -185,8 +186,13 @@ function cleanup {
       echo "kubectl logs ${mcad_pod} -n kube-system"
       kubectl logs ${mcad_pod} -n kube-system
     fi
-    kind delete cluster ${CLUSTER_CONTEXT}
     rm -rf ${ROOT_DIR}/get_helm.sh
+    if [[ $CLEANUP_CLUSTER == "true" ]]
+    then
+      kind delete cluster ${CLUSTER_CONTEXT}     
+    else 
+      echo "Cluster requested to stay up, not deleting cluster"     
+    fi 
 }
 
 debug_function() {
@@ -231,7 +237,7 @@ spec:
             spec:
               containers:
                - name: hellodiana-2-test-0
-                 image: k8s.gcr.io/echoserver:1.4
+                 image: ${IMAGE_ECHOSERVER}
                  imagePullPolicy: Always
                  ports:
                  - containerPort: 80
@@ -287,8 +293,7 @@ EOF
 }
 
 function kube-test-env-up {
-    cd ${ROOT_DIR}
-
+ 
     echo "---"
     export KUBECONFIG="$(kind get kubeconfig-path ${CLUSTER_CONTEXT})"
 
@@ -384,6 +389,4 @@ kind-up-cluster
 kube-test-env-up
 
 echo "==========================>>>>> Running E2E tests... <<<<<=========================="
-go test ./test/e2e -v -timeout 55m
-debug_function
-sleep 3600s
+go test ./test/e2e -v -timeout 55m

test/e2e/queue.go

@@ -155,7 +155,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		aw := createJobAWWithInitContainer(context, "aw-job-3-init-container", 60, "exponential", 0)
 		appwrappers = append(appwrappers, aw)
 
-		err := waitAWPodsCompleted(context, aw, 720 * time.Second) // This test waits for 10 minutes to make sure all PODs complete
+		err := waitAWPodsCompleted(context, aw, 720*time.Second) // This test waits for 10 minutes to make sure all PODs complete
 		Expect(err).NotTo(HaveOccurred())
 	})
 
@@ -173,7 +173,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		aw := createJobAWWithInitContainer(context, "aw-job-3-init-container", 1, "none", 3)
 		appwrappers = append(appwrappers, aw)
 
-		err := waitAWPodsCompleted(context, aw, 300 * time.Second)
+		err := waitAWPodsCompleted(context, aw, 300*time.Second)
 		Expect(err).To(HaveOccurred())
 	})
 
@@ -615,7 +615,7 @@ var _ = Describe("AppWrapper E2E Test", func() {
 		aw := createGenericJobAWWithScheduleSpec(context, "aw-test-job-with-scheduling-spec")
 		err1 := waitAWPodsReady(context, aw)
 		Expect(err1).NotTo(HaveOccurred())
-		err2 := waitAWPodsCompleted(context, aw, 90 * time.Second)
+		err2 := waitAWPodsCompleted(context, aw, 90*time.Second)
 		Expect(err2).NotTo(HaveOccurred())
 
 		// Once pods are completed, we wait for them to see if they change their status to anything BUT "Completed"
@@ -733,8 +733,8 @@ var _ = Describe("AppWrapper E2E Test", func() {
 
 		context := initTestContext()
 		var aws []*arbv1.AppWrapper
-		//appwrappersPtr := &aws
-		//defer cleanupTestObjectsPtr(context, appwrappersPtr)
+		appwrappersPtr := &aws
+		defer cleanupTestObjectsPtr(context, appwrappersPtr)
 
 		const (
 			awCount           = 100