Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Include ODC common make targets
DEV_KIT_VERSION := v1.0.15
DEV_KIT_VERSION := v2.1.0
Comment thread
coderabbitai[bot] marked this conversation as resolved.
-include common.mk
common.mk:
@[ -f .common.mk-download ] || \
Expand Down Expand Up @@ -70,11 +70,6 @@ lint: lint-no-golangci golangci-lint ## Run linters
lint-no-golangci: $(ADDLICENSE) shellcheck ## Run linters but not golangci-lint to exit early in CI/CD pipeline
$(MAKE) addlicense-check license=apache comment='$(LICENSE_COMMENT)' pattern='*\.go'

.PHONY: envtest-binaries-sideload
envtest-binaries-sideload: $(SETUP_ENVTEST) ## Populate the envtest cache for ENVTEST_K8S_VERSION from upstream K8s/etcd releases when controller-tools hasn't packaged it
@SETUP_ENVTEST=$(SETUP_ENVTEST) BIN_DIR=$(LOCALBIN) YQ=$(YQ) \
bash hack/envtest-sideload.sh $(ENVTEST_K8S_VERSION)

.PHONY: test
test: $(SETUP_ENVTEST) $(GINKGO) envtest-binaries-sideload ## Run all tests
@KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -i -p path)" $(GINKGO) -r -cover --fail-fast --require-suite -covermode count --output-dir=$(BUILD_PATH) -coverprofile=arc.full.coverprofile $(testargs)
Expand Down
4 changes: 2 additions & 2 deletions docs/developer-guide/developing-locally.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ The system **pins specific tool versions** for reproducibility:
- Go linter: `v2.5.0`
- CRD/RBAC generator: `v0.19.0`
- Kubernetes test API server: `release-0.22`
- K8s for integration tests: `1.34.1`
- K8s for integration tests: see `ENVTEST_K8S_VERSION` in the `Makefile`

***

Expand Down Expand Up @@ -127,7 +127,7 @@ See Client Libraries section for usage details.
ARC uses a multi-layered testing strategy:

- **Unit Tests**
- **Integration Tests** (uses `ENVTEST_K8S_VERSION=1.34.1`)
- **Integration Tests** (envtest; K8s version pinned by `ENVTEST_K8S_VERSION` in the `Makefile`)
- **Controller Tests** via envtest
- **E2E Tests** using local `kind` cluster via `make test-e2e`

Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

172 changes: 0 additions & 172 deletions hack/envtest-sideload.sh

This file was deleted.

Loading