Merge pull request #1470 from brito-rafa/brito-rafa/brito-rafa/kubebuilder-markers-for-sysprep

🌱 Enforce non-empty validation to sysprep fullname and orgname

Author: brito-rafa

api/v1alpha5/sysprep/sysprep.go

@@ -223,9 +223,15 @@ type LicenseFilePrintData struct {
 // personal data pertaining to the owner of the virtual machine.
 type UserData struct {
 
+	// +required
+	// +kubebuilder:validation:MinLength=1
+
 	// FullName is the user's full name.
 	FullName string `json:"fullName"`
 
+	// +required
+	// +kubebuilder:validation:MinLength=1
+
 	// OrgName is the name of the user's organization.
 	OrgName string `json:"orgName"`
 

config/crd/bases/vmoperator.vmware.com_virtualmachinereplicasets.yaml

@@ -6058,10 +6058,12 @@ spec:
                                     properties:
                                       fullName:
                                         description: FullName is the user's full name.
+                                        minLength: 1
                                         type: string
                                       orgName:
                                         description: OrgName is the name of the user's
                                           organization.
+                                        minLength: 1
                                         type: string
                                       productID:
                                         description: |-

config/crd/bases/vmoperator.vmware.com_virtualmachines.yaml

@@ -10752,9 +10752,11 @@ spec:
                             properties:
                               fullName:
                                 description: FullName is the user's full name.
+                                minLength: 1
                                 type: string
                               orgName:
                                 description: OrgName is the name of the user's organization.
+                                minLength: 1
                                 type: string
                               productID:
                                 description: |-

pkg/providers/vsphere/vmlifecycle/bootstrap_sysprep.go

@@ -129,13 +129,14 @@ func convertTo(
 	}
 
 	sysprepCustomization.UserData = vimtypes.CustomizationUserData{
-		// This is a mandatory field
+		// These are mandatory fields
+		FullName: from.UserData.FullName,
+		OrgName:  from.UserData.OrgName,
 		ComputerName: &vimtypes.CustomizationFixedName{
 			Name: bsArgs.HostName,
 		},
 	}
-	sysprepCustomization.UserData.FullName = from.UserData.FullName
-	sysprepCustomization.UserData.OrgName = from.UserData.OrgName
+
 	// In the case of a VMI with volume license key, this might not be set.
 	// Hence, add a check to see if the productID is set to empty.
 	if bootstrapData.Sysprep != nil && bootstrapData.Sysprep.ProductID != "" {