Skip to content

Add KIND_CLUSTER make variable to allow targeting different kind #534

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

Open
burmanm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add KIND_CLUSTER make variable to allow targeting different kind #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ IMAGE_TAG_BASE ?= $(ORG)/cass-operator

M_INTEG_DIR ?= all

# KIND_CLUSTER is the kind context to target with the make commands to load images
KIND_CLUSTER ?= kind

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
Expand Down Expand Up @@ -165,8 +168,8 @@ docker-build: ## Build docker image with the manager.

.PHONY: docker-kind
docker-kind: docker-build ## Build docker image and load to kind cluster
kind load docker-image ${IMG}
kind load docker-image ${IMG_LATEST}
kind load docker-image --name $(KIND_CLUSTER) ${IMG}
kind load docker-image --name $(KIND_CLUSTER) ${IMG_LATEST}

.PHONY: docker-push
docker-push: ## Build and push docker image with the manager.
Expand All @@ -184,8 +187,8 @@ docker-logger-push: ## Push system-logger-image

.PHONY: docker-logger-kind
docker-logger-kind: docker-logger-build ## Build system-logger image and load to kind cluster
kind load docker-image ${LOG_IMG}
kind load docker-image ${LOG_IMG_LATEST}
kind load docker-image --name $(KIND_CLUSTER) ${LOG_IMG}
kind load docker-image --name $(KIND_CLUSTER) ${LOG_IMG_LATEST}

##@ Deployment

Expand Down
2 changes: 1 addition & 1 deletion hack/cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ "${running}" != 'true' ]; then
fi

# create a cluster with the local registry enabled in containerd
cat <<EOF | kind create cluster --image kindest/node:v1.25.3 --config=-
cat <<EOF | kind create cluster --image kindest/node:v1.26.4 --config=-
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
containerdConfigPatches:
Expand Down