Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert automatic bpfman image loading into KIND cluster #113

Merged
merged 2 commits into from
Sep 3, 2024
Merged

Revert automatic bpfman image loading into KIND cluster #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a020c5
Revert "Makefile: ensure `run-on-kind` works without local images"
frobware Aug 27, 2024
8650f28
Revert "Makefile: Ensure ${BPFMAN_IMG} is loaded into KIND cluster"
frobware Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 2 additions & 23 deletions Makefile
View file
Open in desktop
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
Loading