reduce scope to vm/vmi

Signed-off-by: L. Pivarc <lpivarc@redhat.com>
yulng · Oct 20, 2020 · 0c4ed85 · 0c4ed85
1 parent a05afa7
commit 0c4ed85
Show file tree

Hide file tree

Showing 14 changed files with 514 additions and 1,039 deletions.
diff --git a/api/api-rule-violations-known.list b/api/api-rule-violations-known.list
@@ -144,6 +144,7 @@ API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,N
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,PrivateOptions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DeveloperConfiguration,FeatureGates
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Disks
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Filesystems
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,GPUs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Inputs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Interfaces

diff --git a/api/api-rule-violations.list b/api/api-rule-violations.list
@@ -144,6 +144,7 @@ API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,N
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,PrivateOptions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DeveloperConfiguration,FeatureGates
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Disks
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Filesystems
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,GPUs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Inputs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Interfaces

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -8544,8 +8544,7 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/v1.Filesystem"
-      },
-      "x-kubernetes-list-type": "set"
+      }
      },
      "gpus": {
       "description": "Whether to attach a GPU device to the vmi.",

diff --git a/manifests/generated/kv-resource.yaml b/manifests/generated/kv-resource.yaml
diff --git a/pkg/virt-operator/creation/components/crds.go b/pkg/virt-operator/creation/components/crds.go
@@ -52,28 +52,19 @@ var (
 )
 
 func patchValidation(crd *extv1beta1.CustomResourceDefinition) {
+	name := crd.Spec.Names.Singular
+	if name != "virtualmachine" && name != "virtualmachineinstance" {
+		return
+	}
+
 	crd.Spec.PreserveUnknownFields = &PreserveUnknownFieldsFalse
-	validation, ok := CRDsValidation[crd.Spec.Names.Singular]
+	validation, ok := CRDsValidation[name]
 	if !ok {
 		return
 	}
 	crvalidation := extv1beta1.CustomResourceValidation{}
 	k8syaml.NewYAMLToJSONDecoder(strings.NewReader(validation)).Decode(&crvalidation)
 	crd.Spec.Validation = &crvalidation
-	// workaround issues with metadata in spec
-	// TODO: find out if tests can be changed and this removed
-	if crd.Spec.Names.Singular == "virtualmachine" {
-		spec := crd.Spec.Validation.OpenAPIV3Schema.Properties["spec"]
-		dataVolumeTemplates := spec.Properties["dataVolumeTemplates"]
-		items := dataVolumeTemplates.Items
-		metadata := items.Schema.Properties["metadata"]
-		metadata.Nullable = true
-		t := true
-		metadata.XPreserveUnknownFields = &t
-
-		items.Schema.Properties["metadata"] = metadata
-
-	}
 }
 
 func newBlankCrd() *extv1beta1.CustomResourceDefinition {

diff --git a/pkg/virt-operator/creation/components/crds_test.go b/pkg/virt-operator/creation/components/crds_test.go
@@ -15,12 +15,12 @@ var _ = Describe("CRDs", func() {
 	},
 		table.Entry("for VM", NewVirtualMachineCrd()),
 		table.Entry("for VMI", NewVirtualMachineInstanceCrd()),
-		table.Entry("for VMIPRESET", NewPresetCrd()),
-		table.Entry("for VMIRS", NewReplicaSetCrd()),
-		table.Entry("for VMIM", NewVirtualMachineInstanceMigrationCrd()),
-		table.Entry("for KV", NewKubeVirtCrd()),
-		table.Entry("for VMSNAPSHOT", NewVirtualMachineSnapshotCrd()),
-		table.Entry("for VMSNAPSHOTCONTENT", NewVirtualMachineSnapshotContentCrd()),
+		table.PEntry("for VMIPRESET", NewPresetCrd()),
+		table.PEntry("for VMIRS", NewReplicaSetCrd()),
+		table.PEntry("for VMIM", NewVirtualMachineInstanceMigrationCrd()),
+		table.PEntry("for KV", NewKubeVirtCrd()),
+		table.PEntry("for VMSNAPSHOT", NewVirtualMachineSnapshotCrd()),
+		table.PEntry("for VMSNAPSHOTCONTENT", NewVirtualMachineSnapshotContentCrd()),
 	)
 
 	It("DataVolumeTemplates should have nullable a XPreserveUnknownFields on metadata", func() {
@@ -47,7 +47,7 @@ var _ = Describe("CRDs", func() {
 		Expect(*metadata.XPreserveUnknownFields).To(BeTrue())
 	})
 
-	It("Template in VMRS should have nullable a XPreserveUnknownFields on metadata", func() {
+	PIt("Template in VMRS should have nullable a XPreserveUnknownFields on metadata", func() {
 		crd := NewReplicaSetCrd()
 		patchValidation(crd)
 		spec := crd.Spec.Validation.OpenAPIV3Schema.Properties["spec"]
@@ -58,7 +58,7 @@ var _ = Describe("CRDs", func() {
 		Expect(*metadata.XPreserveUnknownFields).To(BeTrue())
 	})
 
-	It("Template in VMSnapshotContent should have nullable a XPreserveUnknownFields on metadata", func() {
+	PIt("Template in VMSnapshotContent should have nullable a XPreserveUnknownFields on metadata", func() {
 		crd := NewVirtualMachineSnapshotContentCrd()
 		patchValidation(crd)
 		spec := crd.Spec.Validation.OpenAPIV3Schema.Properties["spec"]