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 "Update kubebuilder to the latest working version" #7632

Merged
merged 5 commits into from
May 28, 2024
Merged

Revert "Update kubebuilder to the latest working version" #7632

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
217f645
Revert "Update kubebuilder to the latest working version (#7629)"
sk593 May 23, 2024
4b83181
update kubernetes version
sk593 May 24, 2024
753bc09
Merge branch 'main' into revert-7629-update-kubebuilder
sk593 May 28, 2024
267dc1b
Merge branch 'main' into revert-7629-update-kubebuilder
sk593 May 28, 2024
25e5365
Merge branch 'main' into revert-7629-update-kubebuilder
sk593 May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/test.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RADIUS_CONTAINER_LOG_PATH ?=./dist/container_logs
REL_VERSION ?=latest
DOCKER_REGISTRY ?=ghcr.io/radius-project/dev
ENVTEST_ASSETS_DIR=$(shell pwd)/bin
K8S_VERSION=1.23.*
K8S_VERSION=1.30.*
ENV_SETUP=$(GOBIN)/setup-envtest$(BINARY_EXT)

# Use gotestsum if available, otherwise use go test. We want to enable testing with just 'make test'
Expand All @@ -49,7 +49,7 @@ test: test-get-envtools ## Runs unit tests, excluding kubernetes controller test
.PHONY: test-get-envtools
test-get-envtools:
@echo "$(ARROW) Installing Kubebuilder test tools..."
$(call go-install-tool,$(ENV_SETUP),sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240521074430-fbb7d370bebc)
$(call go-install-tool,$(ENV_SETUP),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to update the Kubernetes version? or do that separately?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it makes sense to address them at the same time. I'll add that update to this PR

@echo "$(ARROW) Instructions:"
@echo "$(ARROW) Set environment variable KUBEBUILDER_ASSETS for tests."
@echo "$(ARROW) KUBEBUILDER_ASSETS=\"$(shell $(ENV_SETUP) use -p path ${K8S_VERSION} --arch amd64)\""
Expand Down