Install kuttl locally via the Makefile

Author: swiatekm

.github/workflows/e2e.yaml

@@ -47,9 +47,6 @@ jobs:
       with:
         go-version: "~1.21.3"
 
-    - name: "install kuttl"
-      run: ./hack/install-kuttl.sh
-
     - name: "run tests"
       env:
         KUBE_VERSION: ${{ matrix.kube-version }}

.github/workflows/scorecard.yaml

@@ -27,21 +27,13 @@ jobs:
         with:
           go-version: "~1.21.1"
 
-      - name: Setup kind
-        env:
-          KIND_VERSION: "0.20.0"
-        run: go install sigs.k8s.io/kind@v${KIND_VERSION}
-
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
 
-      - name: "install kuttl and kind"
-        run: ./hack/install-kuttl.sh
-
       - name: "start kind"
         env:
           KUBE_VERSION: ${{ matrix.kube-version }}
-        run: kind create cluster --config kind-$KUBE_VERSION.yaml
+        run: make start-kind
 
       - name: "wait until cluster is ready"
         run:  kubectl wait --timeout=5m --for=condition=available deployment/coredns -n kube-system

Makefile

@@ -356,6 +356,7 @@ cmctl:
 
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 KIND ?= $(LOCALBIN)/kind
+KUTTL ?= $(LOCALBIN)/kubectl-kuttl
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 CHLOGGEN ?= $(LOCALBIN)/chloggen
@@ -365,6 +366,7 @@ KUSTOMIZE_VERSION ?= v5.0.3
 CONTROLLER_TOOLS_VERSION ?= v0.12.0
 GOLANGCI_LINT_VERSION ?= v1.54.0
 KIND_VERSION ?= v0.20.0
+KUTTL_VERSION ?= 0.15.0
 
 
 .PHONY: kustomize
@@ -411,22 +413,7 @@ endef
 
 .PHONY: kuttl
 kuttl:
-ifeq (, $(shell which kubectl-kuttl))
-	echo ${PATH}
-	ls -l /usr/local/bin
-	which kubectl-kuttl
-
-	@{ \
-	set -e ;\
-	echo "" ;\
-	echo "ERROR: kuttl not found." ;\
-	echo "Please check https://kuttl.dev/docs/cli.html for installation instructions and try again." ;\
-	echo "" ;\
-	exit 1 ;\
-	}
-else
-KUTTL=$(shell which kubectl-kuttl)
-endif
+	@KUTTL=$(KUTTL) KUTTL_VERSION=$(KUTTL_VERSION) ./hack/install-kuttl.sh
 
 OPERATOR_SDK = $(shell pwd)/bin/operator-sdk
 .PHONY: operator-sdk

hack/install-kuttl.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
-sudo curl -Lo /usr/local/bin/kubectl-kuttl https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kubectl-kuttl_0.15.0_linux_x86_64
-sudo chmod +x /usr/local/bin/kubectl-kuttl
-export PATH=$PATH:/usr/local/bin
+if (${KUTTL} version | grep ${KUTTL_VERSION}) > /dev/null 2>&1; then
+  exit 0;
+fi
+
+OS=$(go env GOOS)
+ARCH=$(uname -m)
+
+curl -Lo ${KUTTL} https://github.com/kudobuilder/kuttl/releases/download/v${KUTTL_VERSION}/kubectl-kuttl_${KUTTL_VERSION}_${OS}_${ARCH}
+chmod +x ${KUTTL}
+