[x-port] [9.1] Crossport changes to achieve parity with Content Library OVF parsing#1523
Merged
aruneshpa merged 16 commits intovmware-tanzu:release/vc-9.1.0from Mar 17, 2026
Conversation
aruneshpa
changed the title
Added a test to test vapp config props Fixed tests due to govmomi changes. Since govmomi is bumped up, few tests failed. Fixed them.
Move defer cleanup registration immediately after directory creation for better error handling. Fix cleanup for non-empty directories on non-TLD datastores by using DeleteDatastoreFile() first, then DeleteDirectory() to clean up namespace mapping.
…mware-tanzu#1482) When reconciling VMI status.disks we should consider, when present, the DeploymentOptionSection and the default configuration. This PR updates UpdateVmiWithOvfEnvelope() to: 1. Check for the presence of the DeploymentOptionSection 2. If present, - check for a confugration marked as default - if not configuration is marked explicitly as default, use the first configuration item 3. When populating status.disks, only consider those Items in VirtualHardware which - specify the default configuration via Item.Configuration, and - specify no configuration key via Item.Configuration, and therefore, apply to all configuation If no DeploymentOptionSection is present, then we consider all Items in VirtualHardware as is currently done.
…-tanzu#1509) As of now, if the underlying datastore supports both 4kn and 512n logical sector sizes, then we end up favoring the 4kn size. The vSphere API docs mention that we should be picking 512n, so do that instead.
This patch allows images with no disks to bypass the quota check.
This patch updates VMs to default to otherLinuxGuest (32-bit) if a guest ID is not specified in the class or VM spec or image, and the image contains a BusLogic SCSI controller.
This patch supports fast-deploy with disks not backed by files in the OVF.
This patch adds VM deploy tests using stock, VMware images.
This patch changes any vAppProperties that are type=expression into strings so the user can configure them using vApp bootstrap templating. The expressions are specific to vApp network configuration, which Supervisor does not support.
This patch reverses the vApp property min/max qualifiers for string types.
This patch udpates how VMI status information is realized from OVFS. The OVF is first converted to a ConfigSpec in order to benefit from GoVmomi's ability to manage deployment configs and virtual system collections.
This PR improves the error reporting of the guest customization failures and adds the failure to the Guest customization condition.
When populating a VMI status.disk, we may encounter disks which have
duplicate names. For example
```
...
<DiskSection>
<Info>Virtual disk information</Info>
<Disk ovf:capacity="107373568" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" />
<Disk ovf:capacity="107373568" ovf:diskId="vmdisk2" ovf:fileRef="file2" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" />
</DiskSection>
...
<VirtualHardwareSection>
...
<Item>
<rasd:AddressOnParent>0</rasd:AddressOnParent>
<rasd:ElementName>Hard disk 1</rasd:ElementName>
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
<rasd:InstanceID>8</rasd:InstanceID>
<rasd:Parent>3</rasd:Parent>
<rasd:ResourceType>17</rasd:ResourceType>
</Item>
<Item>
<rasd:AddressOnParent>1</rasd:AddressOnParent>
<rasd:ElementName>Hard disk 1</rasd:ElementName>
<rasd:HostResource>ovf:/disk/vmdisk2</rasd:HostResource>
<rasd:InstanceID>9</rasd:InstanceID>
<rasd:Parent>3</rasd:Parent>
<rasd:ResourceType>17</rasd:ResourceType>
</Item>
...
</VirtualHardwareSection>
...
```
or
```
...
<DiskSection>
<Info>Virtual disk information</Info>
<Disk ovf:capacity="107373568" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" />
</DiskSection>
...
<VirtualHardwareSection>
...
<Item>
<rasd:AddressOnParent>0</rasd:AddressOnParent>
<rasd:ElementName>Hard disk 1</rasd:ElementName>
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
<rasd:InstanceID>8</rasd:InstanceID>
<rasd:Parent>3</rasd:Parent>
<rasd:ResourceType>17</rasd:ResourceType>
</Item>
<Item>
<rasd:AddressOnParent>1</rasd:AddressOnParent>
<rasd:ElementName>Hard disk 1</rasd:ElementName>
<rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
<rasd:InstanceID>9</rasd:InstanceID>
<rasd:Parent>3</rasd:Parent>
<rasd:ResourceType>17</rasd:ResourceType>
</Item>
...
</VirtualHardwareSection>
...
```
are valid OVF configurations, but will cause a failure when patching the VMI status. This is because both disks in both
scenarios here have identical names, `Hard disk 1`. Because `status.Disks` is defined as
```
// +optional
// +listType=map
// +listMapKey=name
// Disks describes the observed disk information for this image.
Disks []VirtualMachineImageDiskInfo `json:"disks,omitempty"`
```
the patch will fail due to these duplicate keys.
This PR updates the logic used to populate `status.Disks` such that when a duplicate name is encountered, it is
deduplicated by appending and incremented suffix, e.g. `_1`, `_2`, etc.
This change pulls in the vm-operator-vc-9.1.0 branch on Govmomi that pulls in changes related to support for OVFs for VM Operator.
aruneshpa
force-pushed
the
minor/x-port-9.1-vm-op-ovf-parsing
branch
from
d06b895 to
4124d8f
Compare
faisalabujabal
approved these changes
Mar 17, 2026
bryanv
approved these changes
Mar 17, 2026
aruneshpa
merged commit 7700558
into
vmware-tanzu:release/vc-9.1.0
22 of 23 checks passed
Minimum allowed line rate is |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do, and why is it needed?
This PR is a collection of changes that we need to crossport to the 9.1 release in order to support deployment of a broad set of OVFs with custom properties.
Commits being crossported:
On top of the above changes that are a direct crossport, we included one manual commit (768ef6d) to pull in changes from Govmomi branch: https://github.com/vmware/govmomi/tree/vm-operator-vc-9.1.0
Please add a release note if necessary: