Skip to content

Commit 79d64e8

Browse files
authored
Simplify kind-load (#803)
This simplified logic should work on both podman and docker, removing our need to have distinct ways of handling the image loading.
1 parent ae0fa8f commit 79d64e8

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,7 @@ e2e-coverage:
154154

155155
.PHONY: kind-load
156156
kind-load: $(KIND) #EXHELP Loads the currently constructed image onto the cluster.
157-
ifeq ($(CONTAINER_RUNTIME),podman)
158-
@echo "Using Podman"
159-
podman save $(IMG) -o $(IMG).tar
160-
$(KIND) load image-archive $(IMG).tar --name $(KIND_CLUSTER_NAME)
161-
rm $(IMG).tar
162-
else
163-
@echo "Using Docker"
164-
$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
165-
endif
157+
$(CONTAINER_RUNTIME) save $(IMG) | $(KIND) load image-archive /dev/stdin --name $(KIND_CLUSTER_NAME)
166158

167159
kind-deploy: export MANIFEST="./operator-controller.yaml"
168160
kind-deploy: manifests $(KUSTOMIZE) #EXHELP Install controller and dependencies onto the kind cluster.

0 commit comments

Comments
 (0)