Skip to content

Commit

Permalink
Simplify kind-load (#803)
Browse files Browse the repository at this point in the history
This simplified logic should work on both podman and docker, removing
our need to have distinct ways of handling the image loading.
  • Loading branch information
trgeiger committed Apr 30, 2024
1 parent ae0fa8f commit 79d64e8
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 79d64e8

Please sign in to comment.