From 3a500550d2dbb86d044c322be4b2c278f21d5e9d Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 24 Apr 2024 15:49:21 -0400
Subject: [PATCH 1/2] Replace one last CONTAINER_RUNTIME in make

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 71ccd6657a..eb84e458d7 100644
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ run: docker-build kind-cluster kind-load kind-deploy #HELP Build the operator-co
 
 .PHONY: docker-build
 docker-build: build-linux #EXHELP Build docker image for operator-controller with GOOS=linux and local GOARCH.
-	docker build -t ${IMG} -f Dockerfile ./bin/linux
+	$(CONTAINER_RUNTIME) build -t ${IMG} -f Dockerfile ./bin/linux
 
 #SECTION Release
 

From 9e414d714055270bba8f17276af079c23bd0400c Mon Sep 17 00:00:00 2001
From: Brett Tofel <btofel@redhat.com>
Date: Wed, 24 Apr 2024 16:23:01 -0400
Subject: [PATCH 2/2] Workaround for podman for kind load

---
 Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index eb84e458d7..48d7ea6b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,15 @@ e2e-coverage:
 
 .PHONY: kind-load
 kind-load: $(KIND) #EXHELP Loads the currently constructed image onto the cluster.
+ifeq ($(CONTAINER_RUNTIME),podman)
+	@echo "Using Podman"
+	podman save $(IMG) -o $(IMG).tar
+	$(KIND) load image-archive $(IMG).tar --name $(KIND_CLUSTER_NAME)
+	rm $(IMG).tar
+else
+	@echo "Using Docker"
 	$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
+endif
 
 kind-deploy: export MANIFEST="./operator-controller.yaml"
 kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies onto the kind cluster.