Webhook validation for vgpuProfile

kubernetes-sigs · May 31, 2024 · 7a1af63 · 7a1af63
1 parent bc85b61
commit 7a1af63
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 170 deletions.
diff --git a/apis/v1beta1/types.go b/apis/v1beta1/types.go
@@ -251,16 +251,19 @@ type PCIDeviceSpec struct {
 	// DeviceID is the device ID of a virtual machine's PCI, in integer.
 	// Defaults to the eponymous property value in the template from which the
 	// virtual machine is cloned.
+	// Mutually exclusive with VGPUProfile.
 	// +kubebuilder:validation:Required
 	DeviceID *int32 `json:"deviceId,omitempty"`
 	// VendorId is the vendor ID of a virtual machine's PCI, in integer.
 	// Defaults to the eponymous property value in the template from which the
 	// virtual machine is cloned.
+	// Mutually exclusive with VGPUProfile.
 	// +kubebuilder:validation:Required
 	VendorID *int32 `json:"vendorId,omitempty"`
 	// VGPUProfile is the profile name of a virtual machine's vGPU, in string.
 	// Defaults to the eponymous property value in the template from which the
 	// virtual machine is cloned.
+	// Mutually exclusive with DeviceID and VendorID.
 	// +kubebuilder:validation:Required
 	VGPUProfile string `json:"vgpuProfile,omitempty"`
 	// CustomLabel is the hardware label of a virtual machine's PCI device.

diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml
@@ -1221,18 +1221,21 @@ spec:
                       description: DeviceID is the device ID of a virtual machine's
                         PCI, in integer. Defaults to the eponymous property value
                         in the template from which the virtual machine is cloned.
+                        Mutually exclusive with VGPUProfile.
                       format: int32
                       type: integer
                     vendorId:
                       description: VendorId is the vendor ID of a virtual machine's
                         PCI, in integer. Defaults to the eponymous property value
                         in the template from which the virtual machine is cloned.
+                        Mutually exclusive with VGPUProfile.
                       format: int32
                       type: integer
                     vgpuProfile:
-                      description: VGPUProfile is the VGPUProfile of a virtual machine's
+                      description: VGPUProfile is the profile name of a virtual machine's
                         vGPU, in string. Defaults to the eponymous property value
                         in the template from which the virtual machine is cloned.
+                        Mutually exclusive with DeviceID and VendorID.
                       type: string
                   type: object
                 type: array

diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml
@@ -1133,21 +1133,22 @@ spec:
                               description: DeviceID is the device ID of a virtual
                                 machine's PCI, in integer. Defaults to the eponymous
                                 property value in the template from which the virtual
-                                machine is cloned.
+                                machine is cloned. Mutually exclusive with VGPUProfile.
                               format: int32
                               type: integer
                             vendorId:
                               description: VendorId is the vendor ID of a virtual
                                 machine's PCI, in integer. Defaults to the eponymous
                                 property value in the template from which the virtual
-                                machine is cloned.
+                                machine is cloned. Mutually exclusive with VGPUProfile.
                               format: int32
                               type: integer
                             vgpuProfile:
-                              description: VGPUProfile is the VGPUProfile of a virtual
+                              description: VGPUProfile is the profile name of a virtual
                                 machine's vGPU, in string. Defaults to the eponymous
                                 property value in the template from which the virtual
-                                machine is cloned.
+                                machine is cloned. Mutually exclusive with DeviceID
+                                and VendorID.
                               type: string
                           type: object
                         type: array

diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml
@@ -1267,18 +1267,21 @@ spec:
                       description: DeviceID is the device ID of a virtual machine's
                         PCI, in integer. Defaults to the eponymous property value
                         in the template from which the virtual machine is cloned.
+                        Mutually exclusive with VGPUProfile.
                       format: int32
                       type: integer
                     vendorId:
                       description: VendorId is the vendor ID of a virtual machine's
                         PCI, in integer. Defaults to the eponymous property value
                         in the template from which the virtual machine is cloned.
+                        Mutually exclusive with VGPUProfile.
                       format: int32
                       type: integer
                     vgpuProfile:
-                      description: VGPUProfile is the VGPUProfile of a virtual machine's
+                      description: VGPUProfile is the profile name of a virtual machine's
                         vGPU, in string. Defaults to the eponymous property value
                         in the template from which the virtual machine is cloned.
+                        Mutually exclusive with DeviceID and VendorID.
                       type: string
                   type: object
                 type: array

diff --git a/internal/webhooks/vspheremachinetemplate.go b/internal/webhooks/vspheremachinetemplate.go
@@ -84,6 +84,13 @@ func (webhook *VSphereMachineTemplateWebhook) ValidateCreate(_ context.Context,
 			allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "template", "spec", "guestSoftPowerOffTimeout"), spec.GuestSoftPowerOffTimeout, "should be greater than 0"))
 		}
 	}
+	for _, device := range spec.PciDevices {
+		hasVGPU := device.VGPUProfile != ""
+		hasPCI := device.DeviceID != nil && device.VendorID != nil
+		if (hasPCI && hasVGPU) || (!hasPCI && !hasVGPU) {
+			allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "template", "spec", "pciDevices"), spec.PciDevices, "should have either deviceID + vendorID or vgpuProfile"))
+		}
+	}
 	return nil, AggregateObjErrors(obj.GroupVersionKind().GroupKind(), obj.Name, allErrs)
 }
 

diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml
diff --git a/test/e2e/config/vsphere.yaml b/test/e2e/config/vsphere.yaml
@@ -279,7 +279,6 @@ variables:
   # These IDs correspond to Tesla T4s, they are the decimal representation of the hex values.
   DEVICE_ID: 7864
   VENDOR_ID: 4318
-  PROFILE_NAME: grid_v100d-4c
   # CAPV feature flags
   EXP_NODE_ANTI_AFFINITY: "true"
   CAPI_DIAGNOSTICS_ADDRESS: ":8080"