From e1b6bd38550aaada328df0848171a4d8f2491a64 Mon Sep 17 00:00:00 2001 From: Joseph Callen Date: Wed, 28 Aug 2024 15:03:13 -0400 Subject: [PATCH] updates --- config/v1/types_infrastructure.go | 1 - machine/v1beta1/types_vsphereprovider.go | 3 +++ machine/v1beta1/zz_generated.swagger_doc_generated.go | 1 + openapi/generated_openapi/zz_generated.openapi.go | 9 ++++++++- openapi/openapi.json | 5 +++++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index f66008baba9..9e184cd2638 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -1192,7 +1192,6 @@ type VSpherePlatformFailureDomainSpec struct { // +kubebuilder:validation:MinLength=1 // +kubebuilder:validation:MaxLength=80 // +kubebuilder:validation:Required - // +optional Zone string `json:"zone"` // zoneType defines the type of zone that is used for this failure domain. The current available options diff --git a/machine/v1beta1/types_vsphereprovider.go b/machine/v1beta1/types_vsphereprovider.go index b7269319829..4f3af12a240 100644 --- a/machine/v1beta1/types_vsphereprovider.go +++ b/machine/v1beta1/types_vsphereprovider.go @@ -190,6 +190,9 @@ type Workspace struct { // ResourcePool is the resource pool in which VMs are created/located. // +optional ResourcePool string `gcfg:"resourcepool-path,omitempty" json:"resourcePool,omitempty"` + // VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal. + // +optional + VMGroup string `gcfg:"vmGroup,omitempty" json:"vmGroup,omitempty"` } // VSphereMachineProviderStatus is the type that will be embedded in a Machine.Status.ProviderStatus field. diff --git a/machine/v1beta1/zz_generated.swagger_doc_generated.go b/machine/v1beta1/zz_generated.swagger_doc_generated.go index 5bba232bf7f..3c4cb90eb40 100644 --- a/machine/v1beta1/zz_generated.swagger_doc_generated.go +++ b/machine/v1beta1/zz_generated.swagger_doc_generated.go @@ -822,6 +822,7 @@ var map_Workspace = map[string]string{ "folder": "Folder is the folder in which VMs are created/located.", "datastore": "Datastore is the datastore in which VMs are created/located.", "resourcePool": "ResourcePool is the resource pool in which VMs are created/located.", + "vmGroup": "VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal.", } func (Workspace) SwaggerDoc() map[string]string { diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 3692adfb05c..7a8e222e741 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -19483,7 +19483,7 @@ func schema_openshift_api_config_v1_VSpherePlatformFailureDomainSpec(ref common. }, }, }, - Required: []string{"name", "region", "server", "topology"}, + Required: []string{"name", "region", "zone", "server", "topology"}, }, }, Dependencies: []string{ @@ -38793,6 +38793,13 @@ func schema_openshift_api_machine_v1beta1_Workspace(ref common.ReferenceCallback Format: "", }, }, + "vmGroup": { + SchemaProps: spec.SchemaProps{ + Description: "VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal.", + Type: []string{"string"}, + Format: "", + }, + }, }, }, }, diff --git a/openapi/openapi.json b/openapi/openapi.json index b9217c07586..5ea786f0045 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -10559,6 +10559,7 @@ "required": [ "name", "region", + "zone", "server", "topology" ], @@ -22403,6 +22404,10 @@ "server": { "description": "Server is the IP address or FQDN of the vSphere endpoint.", "type": "string" + }, + "vmGroup": { + "description": "VMGroup is the cluster vm group in which virtual machines will be added for vm host group based zonal.", + "type": "string" } } },