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

Fix minikube dev tooling #2662

Merged
merged 1 commit into from
Jul 7, 2022
Merged

Fix minikube dev tooling #2662

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
13 changes: 9 additions & 4 deletions build/includes/minikube.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ minikube_cert_mount := ~/.minikube:$(HOME)/.minikube
# of the right version.
minikube-test-cluster: DOCKER_RUN_ARGS+=--network=host -v $(minikube_cert_mount)
minikube-test-cluster: $(ensure-build-image)
$(MINIKUBE) start --kubernetes-version v1.22.9 -p $(MINIKUBE_PROFILE) --vm-driver $(MINIKUBE_DRIVER)
$(MINIKUBE) start --kubernetes-version v1.22.9 -p $(MINIKUBE_PROFILE) --driver $(MINIKUBE_DRIVER)
Copy link
Member Author

@markmandel markmandel Jul 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Snuck in a change - vm-driver is deprecated.


# Connecting to minikube requires so enhanced permissions, so use this target
# instead of `make shell` to start an interactive shell for development on minikube.
Expand All @@ -39,9 +39,14 @@ minikube-shell: $(ensure-build-image)
# via `make build` or `make build-images` into the "agones" minikube instance.
minikube-push:
$(MINIKUBE) image load $(sidecar_linux_amd64_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image load $(controller_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image load $(ping_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image load $(allocator_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image load $(controller_amd64_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image load $(ping_amd64_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image load $(allocator_amd64_tag) -p $(MINIKUBE_PROFILE)

$(MINIKUBE) image tag $(sidecar_linux_amd64_tag) $(sidecar_tag) -p $(MINIKUBE_PROFILE)
Copy link
Member

Choose a reason for hiding this comment

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

As you noted, this seems likely to break if minikube is running on an ARM machine (e.g. an M1 mac).

Copy link
Member

Choose a reason for hiding this comment

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

I've sent #2663 to update the docs so that this knowledge is more easily discoverable.

$(MINIKUBE) image tag $(controller_amd64_tag) $(controller_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image tag $(ping_amd64_tag) $(ping_tag) -p $(MINIKUBE_PROFILE)
$(MINIKUBE) image tag $(allocator_amd64_tag) $(allocator_tag) -p $(MINIKUBE_PROFILE)

# Installs the current development version of Agones into the Kubernetes cluster.
# Use this instead of `make install`, as it disables PullAlways on the install.yaml
Expand Down