Bring KVM driver in-tree #1828
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // +build linux | ||
|
|
||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "github.com/docker/machine/libmachine/drivers/plugin" | ||
| "k8s.io/minikube/pkg/drivers/kvm" | ||
| ) | ||
|
|
||
| func main() { | ||
| plugin.RegisterDriver(kvm.NewDriver("", "")) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| /* | ||
|
There was a problem hiding this comment. @dlorenc @aaron-prindle Where should the in-tree drivers live? I just used the location that @dlorenc had in his hyperkit PR. We have the none driver in |
||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package kvm | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "text/template" | ||
|
|
||
| libvirt "github.com/libvirt/libvirt-go" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| const domainTmpl = ` | ||
| <domain type='kvm'> | ||
| <name>{{.MachineName}}</name> | ||
| <memory unit='MB'>{{.Memory}}</memory> | ||
| <vcpu>{{.CPU}}</vcpu> | ||
| <features> | ||
| <acpi/> | ||
| <apic/> | ||
| <pae/> | ||
| </features> | ||
| <os> | ||
| <type>hvm</type> | ||
| <boot dev='cdrom'/> | ||
| <boot dev='hd'/> | ||
| <bootmenu enable='no'/> | ||
| </os> | ||
| <devices> | ||
| <disk type='file' device='cdrom'> | ||
| <source file='{{.ISO}}'/> | ||
| <target dev='hdc' bus='scsi'/> | ||
| <readonly/> | ||
| </disk> | ||
| <disk type='file' device='disk'> | ||
| <driver name='qemu' type='raw' cache='default' io='threads' /> | ||
| <source file='{{.DiskPath}}'/> | ||
| <target dev='hda' bus='virtio'/> | ||
| </disk> | ||
| <interface type='network'> | ||
| <source network='{{.Network}}'/> | ||
| <model type='virtio'/> | ||
| </interface> | ||
| <interface type='network'> | ||
| <source network='{{.PrivateNetwork}}'/> | ||
| <model type='virtio'/> | ||
| </interface> | ||
| <serial type='pty'> | ||
| <source path='/dev/pts/2'/> | ||
| <target port='0'/> | ||
| </serial> | ||
| <console type='pty' tty='/dev/pts/2'> | ||
| <source path='/dev/pts/2'/> | ||
| <target port='0'/> | ||
| </console> | ||
| <rng model='virtio'> | ||
| <backend model='random'>/dev/random</backend> | ||
| </rng> | ||
| </devices> | ||
| </domain> | ||
| ` | ||
|
|
||
| const connectionErrorText = ` | ||
| Error connecting to libvirt socket. Have you set up libvirt correctly? | ||
|
|
||
| # Install libvirt and qemu-kvm on your system, e.g. | ||
| # Debian/Ubuntu | ||
| $ sudo apt install libvirt-bin qemu-kvm | ||
| # Fedora/CentOS/RHEL | ||
| $ sudo yum install libvirt-daemon-kvm qemu-kvm | ||
|
|
||
| # Add yourself to the libvirtd group (use libvirt group for rpm based distros) so you don't need to sudo | ||
| # Debian/Ubuntu (NOTE: For Ubuntu 17.04 change the group to libvirt) | ||
| $ sudo usermod -a -G libvirtd $(whoami) | ||
| # Fedora/CentOS/RHEL | ||
| $ sudo usermod -a -G libvirt $(whoami) | ||
|
|
||
| # Update your current session for the group change to take effect | ||
| # Debian/Ubuntu (NOTE: For Ubuntu 17.04 change the group to libvirt) | ||
| $ newgrp libvirtd | ||
| # Fedora/CentOS/RHEL | ||
| $ newgrp libvirt | ||
|
|
||
| Visit https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#kvm-driver for more information. | ||
| ` | ||
|
|
||
| func (d *Driver) getDomain() (*libvirt.Domain, *libvirt.Connect, error) { | ||
| conn, err := getConnection() | ||
| if err != nil { | ||
| return nil, nil, errors.Wrap(err, "getting domain") | ||
| } | ||
|
|
||
| dom, err := conn.LookupDomainByName(d.MachineName) | ||
| if err != nil { | ||
| return nil, nil, errors.Wrap(err, "looking up domain") | ||
| } | ||
|
|
||
| return dom, conn, nil | ||
| } | ||
|
|
||
| func getConnection() (*libvirt.Connect, error) { | ||
| conn, err := libvirt.NewConnect(qemusystem) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, connectionErrorText) | ||
| } | ||
|
|
||
| return conn, nil | ||
| } | ||
|
|
||
| func closeDomain(dom *libvirt.Domain, conn *libvirt.Connect) error { | ||
| dom.Free() | ||
| if res, _ := conn.Close(); res != 0 { | ||
| return fmt.Errorf("Error closing connection CloseConnection() == %d, expected 0", res) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (d *Driver) createDomain() (*libvirt.Domain, error) { | ||
| tmpl := template.Must(template.New("domain").Parse(domainTmpl)) | ||
| var domainXml bytes.Buffer | ||
| if err := tmpl.Execute(&domainXml, d); err != nil { | ||
| return nil, errors.Wrap(err, "executing domain xml") | ||
| } | ||
|
|
||
| conn, err := getConnection() | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "Error getting libvirt connection") | ||
| } | ||
| defer conn.Close() | ||
|
|
||
| dom, err := conn.DomainDefineXML(domainXml.String()) | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "Error defining domain xml: %s", domainXml.String()) | ||
| } | ||
|
|
||
| return dom, nil | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a build tag here to restrict to linux?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done