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

Add the qemu2 driver to the minikube registry #13639

Merged
merged 20 commits into from
May 12, 2022
Merged

Add the qemu2 driver to the minikube registry #13639

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
284ad62
Add the qemu driver to the minikube registry
afbjorklund Feb 20, 2022
98b8b6a
Upgrade to latest docker-machine-driver-qemu
afbjorklund Feb 20, 2022
d9c303e
Use portforwarding for qemu with user network
afbjorklund Feb 22, 2022
927d7d5
Upgrade to latest docker-machine-driver-qemu
afbjorklund Apr 2, 2022
77ed383
Fork the machine qemu driver into minikube qemu2
afbjorklund Apr 3, 2022
6965307
Set up the IP address for the qemu driver
afbjorklund Apr 4, 2022
191ff5b
Add tunneling of apiserver port for qemu driver
afbjorklund Apr 4, 2022
6a7f14e
Use the right port for docker in qemu driver
afbjorklund Apr 4, 2022
af07b2b
Remove fluff from the qemu driver for lint
afbjorklund Apr 4, 2022
d38789a
Add the parameters required for qemu arm64
afbjorklund Apr 4, 2022
e894c88
Add missing machine type for QEMU2 for test
afbjorklund Apr 4, 2022
e7495ab
Make sure to set up apiserver tunnel on restart
afbjorklund Apr 5, 2022
d21342c
Make sure to look for KIC before using oci port
afbjorklund Apr 5, 2022
15c71df
Revert "Make sure to set up apiserver tunnel on restart"
afbjorklund Apr 10, 2022
ae40c57
Add parameters needed for vde networking
afbjorklund Apr 11, 2022
3555b19
fix firmware locations for darwin
sharifelgamal May 3, 2022
5b39a46
Merge branch 'master' of github.com:kubernetes/minikube into anders-q…
sharifelgamal May 3, 2022
00d31d0
Merge branch 'master' of github.com:kubernetes/minikube into anders-q…
sharifelgamal May 11, 2022
9a0f1a0
support darwin hardware acceleration
sharifelgamal May 11, 2022
60328d4
fix lint
sharifelgamal May 11, 2022
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
Prev Previous commit
Next Next commit
Use the right port for docker in qemu driver
  • Loading branch information
@afbjorklund
afbjorklund committed Apr 4, 2022
commit 6a7f14ea01974a59eec8b3d815536c93a90f55b5
5 changes: 4 additions & 1 deletion cmd/minikube/cmd/docker-env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
"k8s.io/klog/v2"

"k8s.io/minikube/pkg/drivers/kic/oci"
"k8s.io/minikube/pkg/drivers/qemu"
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
"k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/constants"
Expand Down Expand Up @@ -290,11 +291,13 @@ var dockerEnvCmd = &cobra.Command{

d := co.CP.Host.Driver
port := constants.DockerDaemonPort
if driver.NeedsPortForward(driverName) {
if driver.NeedsPortForward(driverName) && driver.IsKIC(driverName) {
port, err = oci.ForwardedPort(driverName, cname, port)
if err != nil {
exit.Message(reason.DrvPortForward, "Error getting port binding for '{{.driver_name}} driver: {{.error}}", out.V{"driver_name": driverName, "error": err})
}
} else if driver.NeedsPortForward(driverName) && driverName == driver.QEMU2 {
port = d.(*qemu.Driver).EnginePort
}

hostname, err := d.GetSSHHostname()
Expand Down