Use OCI_BIN to determine where to load images from in integration tests

Modified the Makefile to respect the `OCI_BIN` environment variable,
switching from `kind load docker-image` to `kind load image-archive`.
This change enables support for both Docker and Podman, depending on the
value of `OCI_BIN`.

Updated the integration test suite to utilise the new loadimagearchive
addon instead of the original loadimage addon. The addon also respects
the `OCI_BIN` variable, ensuring images are loaded into kind clusters
from the correct container engine.

Signed-off-by: Andrew McDermott <amcdermo@redhat.com>

Author: frobware

Makefile

@@ -73,6 +73,7 @@ SHELL = /usr/bin/env bash -o pipefail
 # Image building tool (docker / podman) - docker is preferred in CI
 OCI_BIN_PATH := $(shell which docker 2>/dev/null || which podman)
 OCI_BIN ?= $(shell basename ${OCI_BIN_PATH})
+export OCI_BIN
 
 GOARCH ?= $(shell go env GOHOSTARCH)
 PLATFORM ?= $(shell go env GOHOSTOS)/$(shell go env GOHOSTARCH)
@@ -355,7 +356,7 @@ push-images: ## Push bpfman-agent and bpfman-operator images.
 
 .PHONY: load-images-kind
 load-images-kind: ## Load bpfman-agent, and bpfman-operator images into the running local kind devel cluster.
-	kind load docker-image ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG} --name ${KIND_CLUSTER_NAME}
+	./hack/kind-load-image.sh ${KIND_CLUSTER_NAME} ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG}
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.

hack/kind-load-image.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+#
+# Load container images into a specified kind (Kubernetes IN Docker)
+# cluster. Save images from either Docker or Podman, depending on the
+# OCI_BIN environment variable. Defaults to Docker if OCI_BIN is not
+# set.
+#
+# Usage:
+#   ./kind-load-image.sh [-v] <KIND-CLUSTER-NAME> <IMAGE-REFERENCE> [<IMAGE-REFERENCE> ...]
+#
+# Arguments:
+#   -v                 Verbose mode; echo commands before executing them.
+#   KIND-CLUSTER-NAME  Specify the name of the kind cluster.
+#   IMAGE-REFERENCE    Specify one or more image references
+#                      (e.g., quay.io/bpfman/bpfman:latest).
+#
+# Example:
+#   ./kind-load-image.sh -v my-cluster quay.io/bpfman/bpfman:latest quay.io/bpfman/bpfman-operator:latest
+#
+# The script:
+#   1. Save each specified image as a tar file using the specified
+#      OCI_BIN (Docker or Podman).
+#   2. Load each tar file into the specified kind cluster.
+#   3. Clean up temporary files created during the process.
+#
+# Ensure that the specified kind cluster is already running before
+# executing the script.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# Parse options
+verbose=0
+if [ "$1" = "-v" ]; then
+    verbose=1
+    shift
+fi
+
+if [ $# -lt 2 ]; then
+    echo "Usage: ${0##*/} [-v] <KIND_CLUSTER_NAME> <IMAGE REFERENCE> [<IMAGE REFERENCE> ...]"
+    exit 1
+fi
+
+kind_cluster_name="$1"
+shift
+
+: "${OCI_BIN:=docker}"
+
+tmp_dir=$(mktemp -d -t bpfman-XXXXXX)
+
+cleanup() {
+    rm -r "$tmp_dir"
+}
+
+trap cleanup EXIT
+
+save_args=""
+if [ "$OCI_BIN" = "podman" ]; then
+    save_args="--quiet"
+fi
+
+counter=1
+for image_reference in "$@"; do
+    tar_file="$tmp_dir/image-$counter.tar"
+
+    if [ $verbose -eq 1 ]; then
+        echo "$OCI_BIN save $save_args --output \"$tar_file\" \"$image_reference\""
+    fi
+    "$OCI_BIN" save $save_args --output "$tar_file" "$image_reference"
+
+    if [ $verbose -eq 1 ]; then
+        echo "kind load image-archive --name \"$kind_cluster_name\" \"$tar_file\""
+    fi
+    kind load image-archive --name "$kind_cluster_name" "$tar_file"
+
+    counter=$((counter + 1))
+done

test/integration/suite_test.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/kong/kubernetes-testing-framework/pkg/clusters"
-	"github.com/kong/kubernetes-testing-framework/pkg/clusters/addons/loadimage"
 	"github.com/kong/kubernetes-testing-framework/pkg/clusters/types/kind"
 	"github.com/kong/kubernetes-testing-framework/pkg/environments"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -22,6 +21,8 @@ import (
 	"github.com/bpfman/bpfman-operator/internal"
 	"github.com/bpfman/bpfman-operator/pkg/client/clientset"
 	bpfmanHelpers "github.com/bpfman/bpfman-operator/pkg/helpers"
+
+	"github.com/bpfman/bpfman-operator/test/integration/loadimagearchive"
 )
 
 var (
@@ -50,6 +51,11 @@ const (
 func TestMain(m *testing.M) {
 	logf.SetLogger(zap.New())
 
+	ociBin := os.Getenv("OCI_BIN")
+	if ociBin == "" {
+		ociBin = "docker" // default if OCI_BIN is not set.
+	}
+
 	// check that we have the bpfman-agent, and bpfman-operator images to use for the tests.
 	// generally the runner of the tests should have built these from the latest
 	// changes prior to the tests and fed them to the test suite.
@@ -64,7 +70,7 @@ func TestMain(m *testing.M) {
 
 	// to use the provided bpfman-agent, and bpfman-operator images we will need to add
 	// them as images to load in the test cluster via an addon.
-	loadImages, err := loadimage.NewBuilder().WithImage(bpfmanAgentImage)
+	loadImages, err := loadimagearchive.NewBuilder(ociBin).WithImage(bpfmanAgentImage)
 	exitOnErr(err)
 	loadImages, err = loadImages.WithImage(bpfmanOperatorImage)
 	exitOnErr(err)
@@ -93,7 +99,7 @@ func TestMain(m *testing.M) {
 		})
 	}
 
-	// deploy the BPFMAN Operator and revelevant CRDs
+	// deploy the BPFMAN Operator and relevant CRDs.
 	fmt.Println("INFO: deploying bpfman operator to test cluster")
 	exitOnErr(clusters.KustomizeDeployForCluster(ctx, env.Cluster(), bpfmanKustomize))
 	if !keepKustomizeDeploys {