Remove volumeName from disks

Disks and Volumes now need to have matching names, similar to Interfaces and Networks.
rsevilla87 · Jan 14, 2019 · 2d2b502 · 2d2b502
1 parent c9f0c50
commit 2d2b502
Show file tree

Hide file tree

Showing 29 changed files with 230 additions and 369 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -4245,8 +4245,7 @@
    },
    "v1.Disk": {
     "required": [
-     "name",
-     "volumeName"
+     "name"
     ],
     "properties": {
      "bootOrder": {
@@ -4285,10 +4284,6 @@
      "serial": {
       "description": "Serial provides the ability to specify a serial number for the disk device.\n+optional",
       "type": "string"
-     },
-     "volumeName": {
-      "description": "Name of the volume which is referenced.\nMust match the Name of a Volume.",
-      "type": "string"
      }
     }
    },

diff --git a/cluster/examples/vm-alpine-multipvc.yaml b/cluster/examples/vm-alpine-multipvc.yaml
@@ -18,21 +18,19 @@ spec:
           - disk:
               bus: virtio
             name: pvcdisk1
-            volumeName: pvcvolume1
           - disk:
               bus: virtio
             name: pvcdisk2
-            volumeName: pvcvolume2
         machine:
           type: ""
         resources:
           requests:
             memory: 64M
       terminationGracePeriodSeconds: 0
       volumes:
-      - name: pvcvolume1
+      - name: pvcdisk1
         persistentVolumeClaim:
           claimName: disk-alpine
-      - name: pvcvolume2
+      - name: pvcdisk2
         persistentVolumeClaim:
           claimName: disk-custom
diff --git a/cluster/examples/vm-template-fedora.yaml b/cluster/examples/vm-template-fedora.yaml
@@ -35,12 +35,10 @@ objects:
             disks:
             - disk:
                 bus: virtio
-              name: containerdisk
-              volumeName: registryvolume
+              name: registrydisk
             - disk:
                 bus: virtio
               name: cloudinitdisk
-              volumeName: cloudinitvolume
           machine:
             type: ""
           resources:
@@ -50,13 +48,13 @@ objects:
         volumes:
         - containerDisk:
             image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
-          name: registryvolume
+          name: registrydisk
         - cloudInitNoCloud:
             userData: |-
               #cloud-config
               password: fedora
               chpasswd: { expire: False }
-          name: cloudinitvolume
+          name: cloudinitdisk
   status: {}
 parameters:
 - description: Name for the new VM

diff --git a/cluster/examples/vm-template-rhel7.yaml b/cluster/examples/vm-template-rhel7.yaml
@@ -36,15 +36,14 @@ objects:
             - disk:
                 bus: virtio
               name: disk0
-              volumeName: disk0-pvc
           machine:
             type: ""
           resources:
             requests:
               memory: ${MEMORY}
         terminationGracePeriodSeconds: 0
         volumes:
-        - name: disk0-pvc
+        - name: disk0
           persistentVolumeClaim:
             claimName: linux-vm-pvc-${NAME}
   status: {}

diff --git a/cluster/examples/vm-template-windows2012r2.yaml b/cluster/examples/vm-template-windows2012r2.yaml
@@ -46,11 +46,9 @@ objects:
             - disk:
                 bus: sata
               name: pvcdisk
-              volumeName: pvcvolume
             - disk:
                 bus: virtio
               name: disk0
-              volumeName: disk0-pvc
             interfaces:
             - bridge: {}
               model: e1000
@@ -75,10 +73,10 @@ objects:
           pod: {}
         terminationGracePeriodSeconds: 0
         volumes:
-        - name: pvcvolume
+        - name: pvcdisk
           persistentVolumeClaim:
             claimName: disk-windows
-        - name: disk0-pvc
+        - name: disk0
           persistentVolumeClaim:
             claimName: windows-vm-pvc-${NAME}
   status: {}

diff --git a/cluster/examples/vmi-block-pvc.yaml b/cluster/examples/vmi-block-pvc.yaml
@@ -12,14 +12,13 @@ spec:
       - disk:
           bus: virtio
         name: blockpvcdisk
-        volumeName: blockpvcvolume
     machine:
       type: ""
     resources:
       requests:
         memory: 64M
   terminationGracePeriodSeconds: 0
   volumes:
-  - name: blockpvcvolume
+  - name: blockpvcdisk
     persistentVolumeClaim:
       claimName: local-block-storage-cirros
diff --git a/cluster/examples/vmi-pvc.yaml b/cluster/examples/vmi-pvc.yaml
@@ -12,14 +12,13 @@ spec:
       - disk:
           bus: virtio
         name: pvcdisk
-        volumeName: pvcvolume
     machine:
       type: ""
     resources:
       requests:
         memory: 64M
   terminationGracePeriodSeconds: 0
   volumes:
-  - name: pvcvolume
+  - name: pvcdisk
     persistentVolumeClaim:
       claimName: disk-alpine
diff --git a/cluster/examples/vmi-windows.yaml b/cluster/examples/vmi-windows.yaml
@@ -24,7 +24,6 @@ spec:
       - disk:
           bus: sata
         name: pvcdisk
-        volumeName: pvcvolume
       interfaces:
       - bridge: {}
         model: e1000
@@ -49,6 +48,6 @@ spec:
     pod: {}
   terminationGracePeriodSeconds: 0
   volumes:
-  - name: pvcvolume
+  - name: pvcdisk
     persistentVolumeClaim:
       claimName: disk-windows
diff --git a/pkg/api/v1/openapi_generated.go b/pkg/api/v1/openapi_generated.go
diff --git a/pkg/api/v1/schema.go b/pkg/api/v1/schema.go
@@ -249,9 +249,6 @@ type Devices struct {
 type Disk struct {
 	// Name is the device name
 	Name string `json:"name"`
-	// Name of the volume which is referenced.
-	// Must match the Name of a Volume.
-	VolumeName string `json:"volumeName"`
 	// DiskDevice specifies as which device the disk should be added to the guest.
 	// Defaults to Disk.
 	DiskDevice `json:",inline"`

diff --git a/pkg/api/v1/schema_swagger_generated.go b/pkg/api/v1/schema_swagger_generated.go
diff --git a/pkg/api/v1/schema_test.go b/pkg/api/v1/schema_test.go
@@ -125,15 +125,13 @@ var exampleJSON = `{
         "disks": [
           {
             "name": "disk0",
-            "volumeName": "volume0",
             "disk": {
               "bus": "virtio"
             },
             "dedicatedIOThread": true
           },
           {
             "name": "cdrom0",
-            "volumeName": "volume1",
             "cdrom": {
               "bus": "virtio",
               "readonly": true,
@@ -142,23 +140,20 @@ var exampleJSON = `{
           },
           {
             "name": "floppy0",
-            "volumeName": "volume2",
             "floppy": {
               "readonly": true,
               "tray": "open"
             }
           },
           {
             "name": "lun0",
-            "volumeName": "volume3",
             "lun": {
               "bus": "virtio",
               "readonly": true
             }
           },
           {
             "name": "disk1",
-            "volumeName": "volume4",
             "disk": {
               "bus": "virtio"
             },
@@ -181,19 +176,18 @@ var exampleJSON = `{
         "name": "volume0",
         "containerDisk": {
           "image": "test/image",
-          "path": "/disk.img"
         }
       },
       {
-        "name": "volume1",
+        "name": "cdrom0",
         "cloudInitNoCloud": {
           "secretRef": {
             "name": "testsecret"
           }
         }
       },
       {
-        "name": "volume2",
+        "name": "floppy0",
         "persistentVolumeClaim": {
           "claimName": "testclaim"
         }
@@ -218,8 +212,7 @@ var _ = Describe("Schema", func() {
 
 		exampleVMI.Spec.Domain.Devices.Disks = []Disk{
 			{
-				Name:       "disk0",
-				VolumeName: "volume0",
+				Name: "disk0",
 				DiskDevice: DiskDevice{
 					Disk: &DiskTarget{
 						Bus:      "virtio",
@@ -229,8 +222,7 @@ var _ = Describe("Schema", func() {
 				DedicatedIOThread: _true,
 			},
 			{
-				Name:       "cdrom0",
-				VolumeName: "volume1",
+				Name: "cdrom0",
 				DiskDevice: DiskDevice{
 					CDRom: &CDRomTarget{
 						Bus:      "virtio",
@@ -240,8 +232,7 @@ var _ = Describe("Schema", func() {
 				},
 			},
 			{
-				Name:       "floppy0",
-				VolumeName: "volume2",
+				Name: "floppy0",
 				DiskDevice: DiskDevice{
 					Floppy: &FloppyTarget{
 						ReadOnly: true,
@@ -250,8 +241,7 @@ var _ = Describe("Schema", func() {
 				},
 			},
 			{
-				Name:       "lun0",
-				VolumeName: "volume3",
+				Name: "lun0",
 				DiskDevice: DiskDevice{
 					LUN: &LunTarget{
 						Bus:      "virtio",
@@ -260,9 +250,8 @@ var _ = Describe("Schema", func() {
 				},
 			},
 			{
-				Name:       "disk1",
-				VolumeName: "volume4",
-				Serial:     "sn-11223344",
+				Name:   "disk1",
+				Serial: "sn-11223344",
 				DiskDevice: DiskDevice{
 					Disk: &DiskTarget{
 						Bus:      "virtio",
@@ -277,7 +266,7 @@ var _ = Describe("Schema", func() {
 
 		exampleVMI.Spec.Volumes = []Volume{
 			{
-				Name: "volume0",
+				Name: "disk0",
 				VolumeSource: VolumeSource{
 					ContainerDisk: &ContainerDiskSource{
 						Image: "test/image",
@@ -286,7 +275,7 @@ var _ = Describe("Schema", func() {
 				},
 			},
 			{
-				Name: "volume1",
+				Name: "cdrom0",
 				VolumeSource: VolumeSource{
 					CloudInitNoCloud: &CloudInitNoCloudSource{
 						UserDataSecretRef: &v1.LocalObjectReference{
@@ -296,7 +285,7 @@ var _ = Describe("Schema", func() {
 				},
 			},
 			{
-				Name: "volume2",
+				Name: "floppy0",
 				VolumeSource: VolumeSource{
 					PersistentVolumeClaim: &v1.PersistentVolumeClaimVolumeSource{
 						ClaimName: "testclaim",