Update makefile to support standalone Podman #687
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eguzki
requested changes
Jun 5, 2024
Makefile
Outdated
|
|
||
| kind-load-bundle: ## Load image to local cluster | ||
| $(KIND) load docker-image $(BUNDLE_IMG) --name $(KIND_CLUSTER_NAME) | ||
| @mkdir -p ./tmp |
There was a problem hiding this comment.
AFAIK make target kind-load-bundle is not being used. And if it was being used, I would not DRY. instead:
kind-load-bundle: ## Load image to local cluster
$(MAKE) kind-load-image IMG=$(BUNDLE_IMG)I would remove the target if not being used.
make/development-environments.mk
Outdated
| @@ -49,7 +49,12 @@ namespace: ## Creates a namespace where to deploy Kuadrant Operator | |||
| .PHONY: local-deploy | |||
| local-deploy: ## Deploy Kuadrant Operator from the current code | |||
| $(MAKE) docker-build IMG=$(IMAGE_TAG_BASE):dev | |||
| $(KIND) load docker-image $(IMAGE_TAG_BASE):dev --name $(KIND_CLUSTER_NAME) | |||
|
|
|||
| @mkdir -p ./tmp | |||
Makefile
Outdated
|
|
||
| kind-load-image: ## Load image to local cluster | ||
| $(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME) | ||
| @mkdir -p ./tmp |
There was a problem hiding this comment.
This is how I would do this. wdyt?
kind-load-image: ## Load image to local cluster
$(eval TMP_DIR := $(shell mktemp -d))
docker save -o $(TMP_DIR)/image.tar $(IMG) \
&& KIND_EXPERIMENTAL_PROVIDER=$(CONTAINER_ENGINE) $(KIND) load image-archive $(TMP_DIR)/image.tar $(IMG) --name $(KIND_CLUSTER_NAME) ; \
EXITVAL=$$? ; \
rm -rf $(TMP_DIR) ;\
exit $${EXITVAL}
eguzki
approved these changes
Jun 6, 2024
dlaw4608
pushed a commit
to dlaw4608/kuadrant-operator
that referenced
this pull request
Jun 17, 2024
* Support the use of sole podman installation without the need for docker. * updates from PR comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes allow podman to be used as the standalone container engine.
This PR introduces a new environment variable call
CONTAINER_ENGINEwhich defaults to docker. The variable is used in the building of images and tells kind what engine to use.Loading images to the kind clusters has being changed from
kind load docker-image ...tokind load image-archive ...which allows supporting both docker and podman. This does have the extra step of creating the archives for the images.