[WIP] Node network Part1

.gitignore

@@ -3,6 +3,11 @@ vendor/*
 .idea
 *.iml
 cmd/fake-qemu-process/fake-qemu*
+cmd/virt-handler/network-helper/network-helper*
+cmd/virt-handler/cnitool/cnitool*
+cmd/virt-handler/cni/main/ipamonly/ipamonly*
+cmd/virt-handler/cni/ipam/noroutes/noroutes*
+cmd/virt-handler/cni/cni*
 cmd/virt-manifest/virt-manifest*
 cmd/virt-controller/virt-controller*
 cmd/virt-launcher/virt-launcher*

api/openapi-spec/swagger.json

@@ -1930,11 +1930,26 @@
      "device": {
       "type": "string"
      },
+     "mode": {
+      "type": "string"
+     },
      "network": {
       "type": "string"
      }
     }
    },
+   "v1.InterfaceStatus": {
+    "properties": {
+     "ip": {
+      "description": "IP assigned to the device.",
+      "type": "string"
+     },
+     "mac": {
+      "description": "MAC address assigned to the device. This can either be the MAC from the spec or an auto-generated one",
+      "type": "string"
+     }
+    }
+   },
    "v1.InterfaceTarget": {
     "required": [
      "dev"
@@ -2710,6 +2725,13 @@
        "$ref": "#/definitions/v1.VMGraphics"
       }
      },
+     "interfaces": {
+      "description": "Interfaces represent the details of all configured interfaces.",
+      "type": "array",
+      "items": {
+       "$ref": "#/definitions/v1.InterfaceStatus"
+      }
+     },
      "migrationNodeName": {
       "description": "MigrationNodeName is the node where the VM is live migrating to.",
       "type": "string"

automation/test.sh

@@ -130,4 +130,4 @@ kubectl version
 # Disable proxy configuration since it causes test issues
 export -n http_proxy
 # Run functional tests
-FUNC_TEST_ARGS="--ginkgo.noColor" make functest
+FUNC_TEST_ARGS="--ginkgo.noColor" make functest DOCKER_TAG=devel

cluster/vm-nocloud.yaml

@@ -18,9 +18,9 @@ spec:
             nocloud:
                 userDataBase64: I2Nsb3VkLWNvbmZpZwpwYXNzd29yZDogYXRvbWljCnNzaF9wd2F1dGg6IFRydWUKY2hwYXNzd2Q6IHsgZXhwaXJlOiBGYWxzZSB9Cg==
       interfaces:
-      - source:
-          network: default
-        type: network
+      - type: nodeNetwork
+      consoles:
+      - type: pty
     memory:
       unit: MB
       value: 64

cluster/vm.yaml

@@ -1,16 +1,16 @@
 apiVersion: kubevirt.io/v1alpha1
 kind: VirtualMachine
 metadata:
-  name: testvm
+  name: testvm1
 spec:
   domain:
     devices:
       graphics:
       - type: spice
       interfaces:
-      - type: network
-        source:
-          network: default
+      - type: nodeNetwork
+        model:
+          type: virtio
       video:
       - type: qxl
       disks:

cmd/virt-handler/Dockerfile

@@ -26,5 +26,12 @@ RUN dnf -y install libvirt-client genisoimage && \
     dnf -y clean all
 
 COPY virt-handler /virt-handler
+COPY network-helper/network-helper /tools/network-helper
+COPY cnitool/cnitool /tools/cnitool
+COPY cni/cni /tools/cni
+COPY cni/ipam/noroutes/noroutes /plugins/noroutes
+COPY cni/main/ipamonly/ipamonly /plugins/ipamonly
+copy kubevirt.json /etc/cni/net.d/
+copy nodenetwork.json /etc/cni/net.d/
 
 ENTRYPOINT [ "/virt-handler" ]

cmd/virt-handler/cni/ipam/noroutes/noroutes.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"net"
+
+	"github.com/containernetworking/cni/pkg/skel"
+	"github.com/containernetworking/cni/pkg/types"
+	"github.com/containernetworking/cni/pkg/types/current"
+	"github.com/containernetworking/cni/pkg/version"
+	"github.com/containernetworking/plugins/pkg/ipam"
+)
+
+const socketPath = "/run/cni/dhcp.sock"
+
+type NetConf struct {
+	types.NetConf
+	RealIPAM string `json:"realipam"`
+}
+
+func main() {
+	skel.PluginMain(cmdAdd, cmdDel, version.All)
+}
+
+func loadConf(bytes []byte) (*NetConf, string, error) {
+	n := &NetConf{}
+	if err := json.Unmarshal(bytes, n); err != nil {
+		return nil, "", fmt.Errorf("failed to load netconf: %v", err)
+	}
+	return n, n.CNIVersion, nil
+}
+
+func cmdAdd(args *skel.CmdArgs) error {
+
+	n, cniVersion, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+	r, err := ipam.ExecAdd(n.RealIPAM, args.StdinData)
+	if err != nil {
+		return err
+	}
+
+	res, err := current.NewResultFromResult(r)
+	if err != nil {
+		return err
+	}
+	// remove all routes
+	res.Routes = nil
+	// don't mess around with existing default gateways
+	for _, ipconfig := range res.IPs {
+		ipconfig.Gateway = nil
+	}
+	// Force only a route for the acquired IP
+	res.IPs[0].Address.Mask = net.IPv4Mask(255, 255, 255, 255)
+
+	return types.PrintResult(res, cniVersion)
+}
+
+func cmdDel(args *skel.CmdArgs) error {
+
+	n, _, err := loadConf(args.StdinData)
+	if err != nil {
+		return err
+	}
+	return ipam.ExecDel(n.RealIPAM, args.StdinData)
+}