From d813099f78e28cac530e9fb9f69fedd7b0515d7e Mon Sep 17 00:00:00 2001
From: Tayler Geiger <tayler@redhat.com>
Date: Mon, 29 Apr 2024 13:34:22 -0500
Subject: [PATCH] Simplify kind-load

This simplified logic should work on both podman and docker, removing
our need to have distinct ways of handling the image loading.
---
 Makefile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e5de9b442..3f54b6f8b 100644
--- a/Makefile
+++ b/Makefile
@@ -154,15 +154,7 @@ 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
+	$(CONTAINER_RUNTIME) save $(IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
 
 kind-deploy: export MANIFEST="./operator-controller.yaml"
 kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies onto the kind cluster.