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

@@ -339,7 +339,12 @@ 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}
+	TMP_DIR=$$(mktemp -d -t bpfman-XXXXXX); \
+	$(OCI_BIN) save -o $$TMP_DIR/bpfman-operator-img.tar ${BPFMAN_OPERATOR_IMG}; \
+	$(OCI_BIN) save -o $$TMP_DIR/bpfman-agent-img.tar ${BPFMAN_AGENT_IMG}; \
+	kind load image-archive --name ${KIND_CLUSTER_NAME} $$TMP_DIR/bpfman-operator-img.tar; \
+	kind load image-archive --name ${KIND_CLUSTER_NAME} $$TMP_DIR/bpfman-agent-img.tar; \
+	$(RM) -r $$TMP_DIR
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.

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 {