Skip to content

Support building e2e Kind node images for Kubernetes patch releases #752

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
yankay wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −9
Open

Support building e2e Kind node images for Kubernetes patch releases #752

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
25 changes: 18 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ ARTIFACTS ?= $(PROJECT_DIR)/bin
INTEGRATION_TARGET ?= ./test/integration/...

E2E_KIND_VERSION ?= kindest/node:v1.35.0
E2E_KIND_BUILD_NODE_IMAGE_VERSION ?=
CERT_MANAGER_VERSION ?= v1.17.0
USE_EXISTING_CLUSTER ?= false

Expand Down Expand Up @@ -168,19 +169,29 @@ kind-image-build: PLATFORMS=linux/amd64
kind-image-build: IMAGE_BUILD_EXTRA_OPTS=--load
kind-image-build: kind image-build

.PHONY: kind-node-image-build
kind-node-image-build: kind
@if [ -n "$(E2E_KIND_BUILD_NODE_IMAGE_VERSION)" ]; then \
if docker image inspect "$(E2E_KIND_VERSION)" >/dev/null 2>&1; then \
echo "Kind node image $(E2E_KIND_VERSION) already exists locally; skipping build."; \
else \
$(KIND) build node-image "$(E2E_KIND_BUILD_NODE_IMAGE_VERSION)" --image "$(E2E_KIND_VERSION)"; \
fi; \
fi

.PHONY: test-integration
test-integration: manifests fmt vet envtest ginkgo ## Run integration tests.
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" \
$(GINKGO) --junit-report=junit.xml --output-dir=$(ARTIFACTS) -v $(INTEGRATION_TARGET)

.PHONY: test-e2e
test-e2e: kustomize manifests fmt vet envtest ginkgo kind-image-build
E2E_KIND_VERSION=$(E2E_KIND_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ARTIFACTS=$(ARTIFACTS) ./hack/e2e-test.sh
$(MAKE) -C disaggregatedset test-e2e KIND=$(KIND) KUBECTL=$(KUBECTL) E2E_KIND_VERSION=$(E2E_KIND_VERSION) ARTIFACTS=$(ARTIFACTS)
test-e2e: kustomize manifests fmt vet envtest ginkgo kind-image-build kind-node-image-build
E2E_KIND_VERSION=$(E2E_KIND_VERSION) E2E_KIND_BUILD_NODE_IMAGE_VERSION=$(E2E_KIND_BUILD_NODE_IMAGE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ARTIFACTS=$(ARTIFACTS) ./hack/e2e-test.sh
$(MAKE) -C disaggregatedset test-e2e KIND=$(KIND) KUBECTL=$(KUBECTL) E2E_KIND_VERSION=$(E2E_KIND_VERSION) E2E_KIND_BUILD_NODE_IMAGE_VERSION=$(E2E_KIND_BUILD_NODE_IMAGE_VERSION) ARTIFACTS=$(ARTIFACTS)

.PHONY: test-e2e-cert-manager
test-e2e-cert-manager: kustomize manifests fmt vet envtest ginkgo kind-image-build
USE_CERT_MANAGER=true CERT_MANAGER_VERSION=$(CERT_MANAGER_VERSION) E2E_KIND_VERSION=$(E2E_KIND_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ARTIFACTS=$(ARTIFACTS) ./hack/e2e-test.sh
test-e2e-cert-manager: kustomize manifests fmt vet envtest ginkgo kind-image-build kind-node-image-build
USE_CERT_MANAGER=true CERT_MANAGER_VERSION=$(CERT_MANAGER_VERSION) E2E_KIND_VERSION=$(E2E_KIND_VERSION) E2E_KIND_BUILD_NODE_IMAGE_VERSION=$(E2E_KIND_BUILD_NODE_IMAGE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ARTIFACTS=$(ARTIFACTS) ./hack/e2e-test.sh

# Gang scheduling E2E tests with different schedulers
VOLCANO_VERSION ?= v1.12.1
Expand All @@ -189,8 +200,8 @@ VOLCANO_VERSION ?= v1.12.1
test-e2e-gang-scheduling: test-e2e-gang-scheduling-volcano ## Run all gang scheduling E2E tests

.PHONY: test-e2e-gang-scheduling-volcano
test-e2e-gang-scheduling-volcano: kustomize manifests fmt vet envtest ginkgo kind-image-build ## Run gang scheduling E2E tests with Volcano
SCHEDULER_PROVIDER=volcano VOLCANO_VERSION=$(VOLCANO_VERSION) E2E_KIND_VERSION=$(E2E_KIND_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ARTIFACTS=$(ARTIFACTS) ./hack/e2e-test.sh
test-e2e-gang-scheduling-volcano: kustomize manifests fmt vet envtest ginkgo kind-image-build kind-node-image-build ## Run gang scheduling E2E tests with Volcano
SCHEDULER_PROVIDER=volcano VOLCANO_VERSION=$(VOLCANO_VERSION) E2E_KIND_VERSION=$(E2E_KIND_VERSION) E2E_KIND_BUILD_NODE_IMAGE_VERSION=$(E2E_KIND_BUILD_NODE_IMAGE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(IMG) ARTIFACTS=$(ARTIFACTS) ./hack/e2e-test.sh

.PHONY: lint
lint: golangci-lint ## Run golangci-lint linter & yamllint
Expand Down
15 changes: 13 additions & 2 deletions disaggregatedset/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,30 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
# E2E tests using Kind cluster with LWS controller.
KIND_CLUSTER_NAME ?= disaggregatedset-test-e2e
E2E_KIND_VERSION ?= kindest/node:v1.32.2
E2E_KIND_BUILD_NODE_IMAGE_VERSION ?=
E2E_IMG ?= controller:e2e
USE_EXISTING_CLUSTER ?= false
ARTIFACTS ?= $(LOCALBIN)
LWS_VERSION ?= v0.8.0

.PHONY: test-e2e
test-e2e: manifests generate kustomize ginkgo ## Run e2e tests using Kind cluster.
E2E_KIND_VERSION=$(E2E_KIND_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) \
test-e2e: manifests generate kustomize ginkgo kind-node-image-build ## Run e2e tests using Kind cluster.
E2E_KIND_VERSION=$(E2E_KIND_VERSION) E2E_KIND_BUILD_NODE_IMAGE_VERSION=$(E2E_KIND_BUILD_NODE_IMAGE_VERSION) KIND_CLUSTER_NAME=$(KIND_CLUSTER_NAME) KIND=$(KIND) \
KUBECTL=$(KUBECTL) KUSTOMIZE=$(KUSTOMIZE) GINKGO=$(GINKGO) \
USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) IMAGE_TAG=$(E2E_IMG) \
ARTIFACTS=$(ARTIFACTS) LWS_VERSION=$(LWS_VERSION) \
./hack/e2e-test.sh

.PHONY: kind-node-image-build
kind-node-image-build:
@if [ -n "$(E2E_KIND_BUILD_NODE_IMAGE_VERSION)" ]; then \
if docker image inspect "$(E2E_KIND_VERSION)" >/dev/null 2>&1; then \
echo "Kind node image $(E2E_KIND_VERSION) already exists locally; skipping build."; \
else \
$(KIND) build node-image "$(E2E_KIND_BUILD_NODE_IMAGE_VERSION)" --image "$(E2E_KIND_VERSION)"; \
fi; \
fi

.PHONY: cleanup-test-e2e
cleanup-test-e2e: ## Tear down the Kind cluster used for e2e tests
@$(KIND) delete cluster --name $(KIND_CLUSTER_NAME)
Expand Down
Loading