From 336f3fd2c3ec4c48ef52d1fca238a51d63f94e63 Mon Sep 17 00:00:00 2001
From: Patryk Matuszak <305846+pmtk@users.noreply.github.com>
Date: Fri, 10 Mar 2023 18:49:18 +0100
Subject: [PATCH] kuttl for arm64 and minor fixes

---
 validate-microshift/cluster-debug-info.sh |  2 +-
 validate-microshift/kuttl-test.sh         | 39 ++++++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/validate-microshift/cluster-debug-info.sh b/validate-microshift/cluster-debug-info.sh
index 7cb12ba3ff..d28eb96add 100755
--- a/validate-microshift/cluster-debug-info.sh
+++ b/validate-microshift/cluster-debug-info.sh
@@ -29,7 +29,7 @@ done
 
 TO_DESCRIBE=(deployments daemonsets statefulsets replicasets)
 for ns in $(kubectl get namespace -o jsonpath='{.items..metadata.name}'); do
-    oc get namespace $ns -o yaml
+    to_run oc get namespace $ns -o yaml
 
     for resource_type in ${TO_DESCRIBE[*]}; do
         for resource in $(kubectl get $resource_type -n $ns -o name); do
diff --git a/validate-microshift/kuttl-test.sh b/validate-microshift/kuttl-test.sh
index a7c8d2661e..78bbbf3d40 100755
--- a/validate-microshift/kuttl-test.sh
+++ b/validate-microshift/kuttl-test.sh
@@ -5,14 +5,43 @@ set -x
 
 ROOT="$(readlink -f "$(dirname "${BASH_SOURCE[0]}")/../")"
 
-KUTTL_VERSION="0.10.0"
+KUTTL_VERSION="0.15.0"
 KUTTL="$ROOT/bin/kuttl"
 
+unamep=$(uname -p)
+case ${unamep} in
+"x86_64")
+    ARCH=x86_64
+    ;;
+"aarch64")
+    ARCH=arm64
+    ;;
+*)
+    echo >&2 "Unknown architecture: ${unamep}"
+    exit 1
+    ;;
+esac
+
+fetch_kuttl() {
+    for try in $(seq 1 5); do
+        if curl -sSLo $KUTTL "https://github.com/kudobuilder/kuttl/releases/download/v${KUTTL_VERSION}/kubectl-kuttl_${KUTTL_VERSION}_linux_${ARCH}"; then
+            chmod a+x $KUTTL
+            return 0
+        fi
+
+        sleep 5s
+    done
+
+    echo >&2 "Failed to fetch kuttl"
+    exit 1
+}
+
 mkdir -p "$(dirname "$KUTTL")"
-! [ -e $KUTTL ] && curl -sSLo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v"${KUTTL_VERSION}"/kubectl-kuttl_"${KUTTL_VERSION}"_linux_x86_64 && \
-      chmod a+x $KUTTL
+if [ ! -e "$KUTTL" ]; then
+    fetch_kuttl
+fi
 
 $KUTTL test --namespace test || {
-      ./cluster-debug-info.sh
-      exit 1
+    ${ROOT}/validate-microshift/cluster-debug-info.sh
+    exit 1
 }