From f9c8a8d00c71aadd9f2257934ca777471971bf9d Mon Sep 17 00:00:00 2001 From: Bryan Venteicher Date: Wed, 11 Oct 2023 10:19:42 -0500 Subject: [PATCH] Set v1a2 as the storageVersion This is effectively a noop with the v1a2 FFS is not enabled since our post install configure script already forces the storageVersion back to v1a1 in that case. But when the FFS is enabled this results in the correct storageVersion being set. --- api/v1alpha1/virtualmachine_types.go | 2 +- api/v1alpha1/virtualmachineclass_types.go | 2 +- api/v1alpha1/virtualmachineimage_types.go | 4 ++-- api/v1alpha1/virtualmachinepublishrequest_types.go | 2 +- api/v1alpha1/virtualmachineservice_types.go | 2 +- api/v1alpha1/virtualmachinesetresourcepolicy_types.go | 2 +- api/v1alpha2/virtualmachine_types.go | 2 +- api/v1alpha2/virtualmachineclass_types.go | 2 +- api/v1alpha2/virtualmachineimage_types.go | 4 ++-- api/v1alpha2/virtualmachinepublishrequest_types.go | 2 +- api/v1alpha2/virtualmachineservice_types.go | 2 +- api/v1alpha2/virtualmachinesetresourcepolicy_types.go | 2 +- .../vmoperator.vmware.com_clustervirtualmachineimages.yaml | 4 ++-- .../bases/vmoperator.vmware.com_virtualmachineclasses.yaml | 4 ++-- .../crd/bases/vmoperator.vmware.com_virtualmachineimages.yaml | 4 ++-- .../vmoperator.vmware.com_virtualmachinepublishrequests.yaml | 4 ++-- config/crd/bases/vmoperator.vmware.com_virtualmachines.yaml | 4 ++-- .../bases/vmoperator.vmware.com_virtualmachineservices.yaml | 4 ++-- ...operator.vmware.com_virtualmachinesetresourcepolicies.yaml | 4 ++-- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/api/v1alpha1/virtualmachine_types.go b/api/v1alpha1/virtualmachine_types.go index 051efe096..b562f50e7 100644 --- a/api/v1alpha1/virtualmachine_types.go +++ b/api/v1alpha1/virtualmachine_types.go @@ -614,7 +614,7 @@ func (vm *VirtualMachine) SetConditions(conditions Conditions) { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Namespaced,shortName=vm -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Power-State",type="string",JSONPath=".status.powerState" // +kubebuilder:printcolumn:name="Class",type="string",priority=1,JSONPath=".spec.className" diff --git a/api/v1alpha1/virtualmachineclass_types.go b/api/v1alpha1/virtualmachineclass_types.go index 52c9d711d..c8575f205 100644 --- a/api/v1alpha1/virtualmachineclass_types.go +++ b/api/v1alpha1/virtualmachineclass_types.go @@ -133,7 +133,7 @@ type VirtualMachineClassStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=vmclass -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="CPU",type="string",JSONPath=".spec.hardware.cpus" // +kubebuilder:printcolumn:name="Memory",type="string",JSONPath=".spec.hardware.memory" diff --git a/api/v1alpha1/virtualmachineimage_types.go b/api/v1alpha1/virtualmachineimage_types.go index a79c864d5..bc30cd49e 100644 --- a/api/v1alpha1/virtualmachineimage_types.go +++ b/api/v1alpha1/virtualmachineimage_types.go @@ -154,7 +154,7 @@ func (vmImage *VirtualMachineImage) SetConditions(conditions Conditions) { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=vmi;vmimage -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Image-Name",type="string",JSONPath=".status.imageName" // +kubebuilder:printcolumn:name="Version",type="string",JSONPath=".spec.productInfo.version" @@ -194,7 +194,7 @@ func (clusterVirtualMachineImage *ClusterVirtualMachineImage) SetConditions(cond // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=cvmi;cvmimage;clustervmi;clustervmimage -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Image-Name",type="string",JSONPath=".status.imageName" // +kubebuilder:printcolumn:name="Version",type="string",JSONPath=".spec.productInfo.version" diff --git a/api/v1alpha1/virtualmachinepublishrequest_types.go b/api/v1alpha1/virtualmachinepublishrequest_types.go index 091b7fd39..a1c69e9ec 100644 --- a/api/v1alpha1/virtualmachinepublishrequest_types.go +++ b/api/v1alpha1/virtualmachinepublishrequest_types.go @@ -342,7 +342,7 @@ func (vmpr *VirtualMachinePublishRequest) SetConditions(conditions Conditions) { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Namespaced,shortName=vmpub -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // VirtualMachinePublishRequest defines the information necessary to publish a diff --git a/api/v1alpha1/virtualmachineservice_types.go b/api/v1alpha1/virtualmachineservice_types.go index 381c34bb1..fca195ee8 100644 --- a/api/v1alpha1/virtualmachineservice_types.go +++ b/api/v1alpha1/virtualmachineservice_types.go @@ -132,7 +132,7 @@ type VirtualMachineServiceStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:shortName=vmservice -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp" diff --git a/api/v1alpha1/virtualmachinesetresourcepolicy_types.go b/api/v1alpha1/virtualmachinesetresourcepolicy_types.go index ff9288149..6e391f735 100644 --- a/api/v1alpha1/virtualmachinesetresourcepolicy_types.go +++ b/api/v1alpha1/virtualmachinesetresourcepolicy_types.go @@ -55,7 +55,7 @@ type ClusterModuleStatus struct { } // +kubebuilder:object:root=true -// +kubebuilder:storageversion +// +kubebuilder:storageversion:false // +kubebuilder:subresource:status // VirtualMachineSetResourcePolicy is the Schema for the virtualmachinesetresourcepolicies API. diff --git a/api/v1alpha2/virtualmachine_types.go b/api/v1alpha2/virtualmachine_types.go index 90af22976..843253780 100644 --- a/api/v1alpha2/virtualmachine_types.go +++ b/api/v1alpha2/virtualmachine_types.go @@ -459,7 +459,7 @@ type VirtualMachineStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Namespaced,shortName=vm -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Class",type="string",priority=1,JSONPath=".status.class.name" // +kubebuilder:printcolumn:name="Image",type="string",priority=1,JSONPath=".status.image.name" diff --git a/api/v1alpha2/virtualmachineclass_types.go b/api/v1alpha2/virtualmachineclass_types.go index b064df66d..a53500b98 100644 --- a/api/v1alpha2/virtualmachineclass_types.go +++ b/api/v1alpha2/virtualmachineclass_types.go @@ -245,7 +245,7 @@ type VirtualMachineClassStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=vmclass -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="CPU",type="string",JSONPath=".spec.hardware.cpus" // +kubebuilder:printcolumn:name="Memory",type="string",JSONPath=".spec.hardware.memory" diff --git a/api/v1alpha2/virtualmachineimage_types.go b/api/v1alpha2/virtualmachineimage_types.go index fb752062f..c039dc462 100644 --- a/api/v1alpha2/virtualmachineimage_types.go +++ b/api/v1alpha2/virtualmachineimage_types.go @@ -209,7 +209,7 @@ type VirtualMachineImageStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=vmi;vmimage -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Image Name",type="string",JSONPath=".status.name" // +kubebuilder:printcolumn:name="Image Version",type="string",JSONPath=".status.productInfo.version" @@ -246,7 +246,7 @@ type VirtualMachineImageList struct { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=cvmi;cvmimage;clustervmi;clustervmimage -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Image Name",type="string",JSONPath=".status.name" // +kubebuilder:printcolumn:name="Image Version",type="string",JSONPath=".status.productInfo.version" diff --git a/api/v1alpha2/virtualmachinepublishrequest_types.go b/api/v1alpha2/virtualmachinepublishrequest_types.go index 3ab47b634..dc7e35730 100644 --- a/api/v1alpha2/virtualmachinepublishrequest_types.go +++ b/api/v1alpha2/virtualmachinepublishrequest_types.go @@ -334,7 +334,7 @@ type VirtualMachinePublishRequestStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Namespaced,shortName=vmpub -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // VirtualMachinePublishRequest defines the information necessary to publish a diff --git a/api/v1alpha2/virtualmachineservice_types.go b/api/v1alpha2/virtualmachineservice_types.go index f8381eea9..674a6010f 100644 --- a/api/v1alpha2/virtualmachineservice_types.go +++ b/api/v1alpha2/virtualmachineservice_types.go @@ -139,7 +139,7 @@ type VirtualMachineServiceStatus struct { // +kubebuilder:object:root=true // +kubebuilder:resource:shortName=vmservice -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp" diff --git a/api/v1alpha2/virtualmachinesetresourcepolicy_types.go b/api/v1alpha2/virtualmachinesetresourcepolicy_types.go index 582eb2e40..0d7e9e62d 100644 --- a/api/v1alpha2/virtualmachinesetresourcepolicy_types.go +++ b/api/v1alpha2/virtualmachinesetresourcepolicy_types.go @@ -47,7 +47,7 @@ type VSphereClusterModuleStatus struct { } // +kubebuilder:object:root=true -// +kubebuilder:storageversion:false +// +kubebuilder:storageversion // +kubebuilder:subresource:status // VirtualMachineSetResourcePolicy is the Schema for the virtualmachinesetresourcepolicies API. diff --git a/config/crd/bases/vmoperator.vmware.com_clustervirtualmachineimages.yaml b/config/crd/bases/vmoperator.vmware.com_clustervirtualmachineimages.yaml index 50043573c..315800fd0 100644 --- a/config/crd/bases/vmoperator.vmware.com_clustervirtualmachineimages.yaml +++ b/config/crd/bases/vmoperator.vmware.com_clustervirtualmachineimages.yaml @@ -270,7 +270,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - additionalPrinterColumns: @@ -513,6 +513,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} diff --git a/config/crd/bases/vmoperator.vmware.com_virtualmachineclasses.yaml b/config/crd/bases/vmoperator.vmware.com_virtualmachineclasses.yaml index c536b2f13..89897f23d 100644 --- a/config/crd/bases/vmoperator.vmware.com_virtualmachineclasses.yaml +++ b/config/crd/bases/vmoperator.vmware.com_virtualmachineclasses.yaml @@ -215,7 +215,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - additionalPrinterColumns: @@ -499,6 +499,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} diff --git a/config/crd/bases/vmoperator.vmware.com_virtualmachineimages.yaml b/config/crd/bases/vmoperator.vmware.com_virtualmachineimages.yaml index 3e314548b..fb7c0ee1e 100644 --- a/config/crd/bases/vmoperator.vmware.com_virtualmachineimages.yaml +++ b/config/crd/bases/vmoperator.vmware.com_virtualmachineimages.yaml @@ -270,7 +270,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - additionalPrinterColumns: @@ -516,6 +516,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} diff --git a/config/crd/bases/vmoperator.vmware.com_virtualmachinepublishrequests.yaml b/config/crd/bases/vmoperator.vmware.com_virtualmachinepublishrequests.yaml index 7fb9687b2..a89b36c94 100644 --- a/config/crd/bases/vmoperator.vmware.com_virtualmachinepublishrequests.yaml +++ b/config/crd/bases/vmoperator.vmware.com_virtualmachinepublishrequests.yaml @@ -292,7 +292,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - name: v1alpha2 @@ -595,6 +595,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} diff --git a/config/crd/bases/vmoperator.vmware.com_virtualmachines.yaml b/config/crd/bases/vmoperator.vmware.com_virtualmachines.yaml index 06c3acfbd..ee0acb753 100644 --- a/config/crd/bases/vmoperator.vmware.com_virtualmachines.yaml +++ b/config/crd/bases/vmoperator.vmware.com_virtualmachines.yaml @@ -593,7 +593,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - additionalPrinterColumns: @@ -2709,6 +2709,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} diff --git a/config/crd/bases/vmoperator.vmware.com_virtualmachineservices.yaml b/config/crd/bases/vmoperator.vmware.com_virtualmachineservices.yaml index b5fe201ba..fd956acad 100644 --- a/config/crd/bases/vmoperator.vmware.com_virtualmachineservices.yaml +++ b/config/crd/bases/vmoperator.vmware.com_virtualmachineservices.yaml @@ -175,7 +175,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - additionalPrinterColumns: @@ -323,6 +323,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {} diff --git a/config/crd/bases/vmoperator.vmware.com_virtualmachinesetresourcepolicies.yaml b/config/crd/bases/vmoperator.vmware.com_virtualmachinesetresourcepolicies.yaml index 3cf046ae9..ce2e25a8c 100644 --- a/config/crd/bases/vmoperator.vmware.com_virtualmachinesetresourcepolicies.yaml +++ b/config/crd/bases/vmoperator.vmware.com_virtualmachinesetresourcepolicies.yaml @@ -124,7 +124,7 @@ spec: type: object type: object served: true - storage: true + storage: false subresources: status: {} - name: v1alpha2 @@ -222,6 +222,6 @@ spec: type: object type: object served: true - storage: false + storage: true subresources: status: {}