Skip to content

Commit

Permalink
Merge pull request #113 from frobware/revert-ensure-run-on-kind-works…
Browse files Browse the repository at this point in the history
…-without-local-images

Revert automatic bpfman image loading into KIND cluster
  • Loading branch information
mergify[bot] authored Sep 3, 2024
2 parents ddc3f98 + 8650f28 commit eeb144f
Showing 1 changed file with 2 additions and 23 deletions.
25 changes: 2 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -354,29 +354,8 @@ push-images: ## Push bpfman-agent and bpfman-operator images.
$(OCI_BIN) push ${BPFMAN_IMG}

.PHONY: load-images-kind
# Function to check if an image exists locally using podman or docker.
image_exists = \
if [ "$(OCI_BIN)" = "podman" ]; then \
podman image exists $(1); \
elif [ "$(OCI_BIN)" = "docker" ]; then \
docker image inspect $(1) > /dev/null 2>&1; \
else \
echo "Unsupported OCI_BIN value: $(OCI_BIN). Use 'podman' or 'docker'."; \
exit 1; \
fi

.PHONY: load-images-kind
load-images-kind: ## Load bpfman, bpfman-agent, and bpfman-operator images into the running local kind devel cluster.
@set -e; \
images="$$BPFMAN_OPERATOR_IMG $$BPFMAN_AGENT_IMG $$BPFMAN_IMG"; \
for img in $$images; do \
if $(call image_exists,$$img); then \
echo "Loading image $$img into kind cluster ${KIND_CLUSTER_NAME}"; \
./hack/kind-load-image.sh ${KIND_CLUSTER_NAME} $$img; \
else \
echo "Image $$img does not exist locally, skipping."; \
fi; \
done
load-images-kind: ## Load bpfman-agent, and bpfman-operator images into the running local kind devel cluster.
./hack/kind-load-image.sh ${KIND_CLUSTER_NAME} ${BPFMAN_OPERATOR_IMG} ${BPFMAN_AGENT_IMG}

.PHONY: bundle-build
bundle-build: ## Build the bundle image.
Expand Down

0 comments on commit eeb144f

Please sign in to comment.