From 9110f86dfd9cf7e2f015f353ac5fb37b4d238629 Mon Sep 17 00:00:00 2001 From: Joseph Callen Date: Tue, 27 Aug 2024 10:20:15 -0400 Subject: [PATCH] misc updates --- .../VSphereMultiVCenters.yaml | 8 ----- config/v1/types_infrastructure.go | 31 ++++++++++++------- ...1_infrastructures-CustomNoUpgrade.crd.yaml | 29 ++++++++++++----- ...erator_01_infrastructures-Default.crd.yaml | 29 ++++++++++++----- ...frastructures-DevPreviewNoUpgrade.crd.yaml | 29 ++++++++++++----- ...rastructures-TechPreviewNoUpgrade.crd.yaml | 29 ++++++++++++----- .../AAA_ungated.yaml | 29 ++++++++++++----- .../BareMetalLoadBalancer.yaml | 29 ++++++++++++----- .../GCPClusterHostedDNS.yaml | 29 ++++++++++++----- .../GCPLabelsTags.yaml | 29 ++++++++++++----- .../VSphereControlPlaneMachineSet.yaml | 29 ++++++++++++----- .../VSphereHostVMGroupZonal.yaml | 29 ++++++++++++----- .../VSphereMultiVCenters.yaml | 29 ++++++++++++----- .../v1/zz_generated.swagger_doc_generated.go | 22 +++++++------ ...controllerconfigs-CustomNoUpgrade.crd.yaml | 31 ++++++++++++++----- ...nfig_01_controllerconfigs-Default.crd.yaml | 31 ++++++++++++++----- ...rollerconfigs-DevPreviewNoUpgrade.crd.yaml | 31 ++++++++++++++----- ...ollerconfigs-TechPreviewNoUpgrade.crd.yaml | 31 ++++++++++++++----- .../AAA_ungated.yaml | 31 ++++++++++++++----- .../BareMetalLoadBalancer.yaml | 31 ++++++++++++++----- .../GCPClusterHostedDNS.yaml | 31 ++++++++++++++----- .../GCPLabelsTags.yaml | 31 ++++++++++++++----- .../VSphereControlPlaneMachineSet.yaml | 31 ++++++++++++++----- .../VSphereHostVMGroupZonal.yaml | 31 ++++++++++++++----- .../VSphereMultiVCenters.yaml | 31 ++++++++++++++----- .../generated_openapi/zz_generated.openapi.go | 28 ++++++++++------- openapi/openapi.json | 28 ++++++++--------- ...1_infrastructures-CustomNoUpgrade.crd.yaml | 29 ++++++++++++----- ...erator_01_infrastructures-Default.crd.yaml | 29 ++++++++++++----- ...frastructures-DevPreviewNoUpgrade.crd.yaml | 29 ++++++++++++----- ...rastructures-TechPreviewNoUpgrade.crd.yaml | 29 ++++++++++++----- 31 files changed, 629 insertions(+), 264 deletions(-) diff --git a/config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml b/config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml index 9010c67922a..792e851ef65 100644 --- a/config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml +++ b/config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml @@ -36,9 +36,6 @@ tests: - ocp-ci-seg-13 resourcePool: /IBMCloud/host/vcs-8e-workload/Resources template: /IBMCloud/vm/ngirard-dev-rqh5s-rhcos-generated-region-generated-zone - affinityGroup: - vmGroupName: "" - hostGroupName: "" zone: generated-zone nodeNetworking: external: {} @@ -65,7 +62,6 @@ tests: failureDomains: - name: generated-failure-domain region: generated-region - regionType: "" server: server1.dev.cluster.com topology: computeCluster: /IBMCloud/host/vcs-8e-workload @@ -75,11 +71,7 @@ tests: - ocp-ci-seg-13 resourcePool: /IBMCloud/host/vcs-8e-workload/Resources template: /IBMCloud/vm/ngirard-dev-rqh5s-rhcos-generated-region-generated-zone - affinityGroup: - vmGroupName: "" - hostGroupName: "" zone: generated-zone - zoneType: "" nodeNetworking: external: {} internal: {} diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 67d03f4b762..f66008baba9 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -1179,12 +1179,12 @@ type VSpherePlatformFailureDomainSpec struct { // regionType defines the type of region that is used for this failure domain. The current available options // are "", ComputeCluster and Datacenter. - - // +default="" - // +kubebuilder:default="" // +openshift:validation:FeatureGateAwareEnum:featureGate=VSphereHostVMGroupZonal,enum="";ComputeCluster;Datacenter + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=80 // +kubebuilder:validation:Optional - RegionType string `json:"regionType"` + // +optional + RegionType string `json:"regionType,omitempty"` // zone defines the name of a zone tag that will // be attached to a vCenter cluster. The tag @@ -1197,12 +1197,12 @@ type VSpherePlatformFailureDomainSpec struct { // zoneType defines the type of zone that is used for this failure domain. The current available options // are "", HostGroup and ComputeCluster. - // +default="" - // +kubebuilder:default="" + // +kubebuilder:validation:MinLength=1 + // +kubebuilder:validation:MaxLength=80 // +kubebuilder:validation:Optional // +openshift:validation:FeatureGateAwareEnum:featureGate=VSphereHostVMGroupZonal,enum="";HostGroup;ComputeCluster // +optional - ZoneType string `json:"zoneType"` + ZoneType string `json:"zoneType,omitempty"` // server is the fully-qualified domain name or the IP address of the vCenter server. // +kubebuilder:validation:Required @@ -1289,7 +1289,8 @@ type VSpherePlatformTopology struct { // +optional Template string `json:"template,omitempty"` - // affinityGroup is the host and vm group ... + // affinityGroup holds the names of the host and vm groups that + // will be used for HostGroup based failure domains. // // +openshift:validation:featureGate=VSphereHostVMGroupZonal // +kubebuilder:validation:Optional @@ -1298,17 +1299,23 @@ type VSpherePlatformTopology struct { } type VSphereFailureDomainAffinityGroup struct { - // VMGroupName is the name of the VM group + // VMGroupName is the name of the VM group within vCenter for this failure domain + // +openshift:validation:featureGate=VSphereHostVMGroupZonal + // +kubebuilder:validation:MaxLength=80 + // +optional + VMGroup string `json:"vmGroup,omitempty"` + + // HostGroupName is the name of the Host group within vcenter for this failure domain // +openshift:validation:featureGate=VSphereHostVMGroupZonal // +kubebuilder:validation:MaxLength=80 // +optional - VMGroupName string `json:"vmGroupName"` + HostGroup string `json:"hostGroup,omitempty"` - // HostGroupName is the name of the Host group + // VMHostRule is the name of the vm host rule within vCenter for this failure domain // +openshift:validation:featureGate=VSphereHostVMGroupZonal // +kubebuilder:validation:MaxLength=80 // +optional - HostGroupName string `json:"hostGroupName"` + VMHostRule string `json:"vmHostRule,omitempty"` } // VSpherePlatformVCenterSpec stores the vCenter connection fields. diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml index 5bf2d5b0ab7..d5f0607b4b4 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -650,17 +654,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -746,7 +758,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -754,6 +765,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 6797e129eff..0f1f309d171 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -646,17 +650,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -742,10 +754,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml index 31f583375ba..4ea4d6f330e 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -650,17 +654,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -746,7 +758,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -754,6 +765,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml index 9fedc3d9e3b..1e49f42eb08 100644 --- a/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml +++ b/config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -650,17 +654,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -746,7 +758,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -754,6 +765,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml index 120c4487e52..78021217c8c 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -642,17 +646,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -722,10 +734,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml index d110a87407d..3275c8b41fa 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -642,17 +646,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -722,10 +734,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml index e7a98b17bb8..d34bd76207d 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -642,17 +646,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -722,10 +734,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml index a49a17a617f..a37d772faa2 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -642,17 +646,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -722,10 +734,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml index cb6f1ee7651..5a365b75e36 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -642,17 +646,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -738,10 +750,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereHostVMGroupZonal.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereHostVMGroupZonal.yaml index 7a053e2a5a4..d39ae350e22 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereHostVMGroupZonal.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereHostVMGroupZonal.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -646,17 +650,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -726,7 +738,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -734,6 +745,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml index 8ed8d5f5de2..74f870e30ca 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain name @@ -642,17 +646,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -722,10 +734,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/config/v1/zz_generated.swagger_doc_generated.go b/config/v1/zz_generated.swagger_doc_generated.go index c1f558ba569..03d22494ff4 100644 --- a/config/v1/zz_generated.swagger_doc_generated.go +++ b/config/v1/zz_generated.swagger_doc_generated.go @@ -1736,8 +1736,9 @@ func (PowerVSServiceEndpoint) SwaggerDoc() map[string]string { } var map_VSphereFailureDomainAffinityGroup = map[string]string{ - "vmGroupName": "VMGroupName is the name of the VM group", - "hostGroupName": "HostGroupName is the name of the Host group", + "vmGroup": "VMGroupName is the name of the VM group within vCenter for this failure domain", + "hostGroup": "HostGroupName is the name of the Host group within vcenter for this failure domain", + "vmHostRule": "VMHostRule is the name of the vm host rule within vCenter for this failure domain", } func (VSphereFailureDomainAffinityGroup) SwaggerDoc() map[string]string { @@ -1745,13 +1746,14 @@ func (VSphereFailureDomainAffinityGroup) SwaggerDoc() map[string]string { } var map_VSpherePlatformFailureDomainSpec = map[string]string{ - "": "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.", - "name": "name defines the arbitrary but unique name of a failure domain.", - "region": "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.", - "zone": "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.", - "zoneType": "zoneType defines the type of zone that is used for this failure domain. The current available options are \"\", HostGroup and ComputeCluster.", - "server": "server is the fully-qualified domain name or the IP address of the vCenter server.", - "topology": "Topology describes a given failure domain using vSphere constructs", + "": "VSpherePlatformFailureDomainSpec holds the region and zone failure domain and the vCenter topology of that failure domain.", + "name": "name defines the arbitrary but unique name of a failure domain.", + "region": "region defines the name of a region tag that will be attached to a vCenter datacenter. The tag category in vCenter must be named openshift-region.", + "regionType": "regionType defines the type of region that is used for this failure domain. The current available options are \"\", ComputeCluster and Datacenter.", + "zone": "zone defines the name of a zone tag that will be attached to a vCenter cluster. The tag category in vCenter must be named openshift-zone.", + "zoneType": "zoneType defines the type of zone that is used for this failure domain. The current available options are \"\", HostGroup and ComputeCluster.", + "server": "server is the fully-qualified domain name or the IP address of the vCenter server.", + "topology": "Topology describes a given failure domain using vSphere constructs", } func (VSpherePlatformFailureDomainSpec) SwaggerDoc() map[string]string { @@ -1826,7 +1828,7 @@ var map_VSpherePlatformTopology = map[string]string{ "resourcePool": "resourcePool is the absolute path of the resource pool where virtual machines will be created. The absolute path is of the form //host//Resources/. The maximum length of the path is 2048 characters.", "folder": "folder is the absolute path of the folder where virtual machines are located. The absolute path is of the form //vm/. The maximum length of the path is 2048 characters.", "template": "template is the full inventory path of the virtual machine or template that will be cloned when creating new machines in this failure domain. The maximum length of the path is 2048 characters.\n\nWhen omitted, the template will be calculated by the control plane machineset operator based on the region and zone defined in VSpherePlatformFailureDomainSpec. For example, for zone=zonea, region=region1, and infrastructure name=test, the template path would be calculated as //vm/test-rhcos-region1-zonea.", - "affinityGroup": "affinityGroup is the host and vm group ...", + "affinityGroup": "affinityGroup holds the names of the host and vm groups that will be used for HostGroup based failure domains.", } func (VSpherePlatformTopology) SwaggerDoc() map[string]string { diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml index 4f94bf44ef2..c714a72bf78 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml @@ -910,11 +910,16 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -928,17 +933,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1035,7 +1049,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup @@ -1044,6 +1057,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index af745829495..3ec17eb2cdf 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1031,11 +1045,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml index ab2ff82eede..4f89b3ea1d6 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml @@ -910,11 +910,16 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -928,17 +933,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1035,7 +1049,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup @@ -1044,6 +1057,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml index f87e9caa03a..61c9bfa3ade 100644 --- a/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml +++ b/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml @@ -910,11 +910,16 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -928,17 +933,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1035,7 +1049,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup @@ -1044,6 +1057,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml index 93482feb2a7..c60957c659a 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1014,11 +1028,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml index b2248e15f36..66ecb8d062f 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1014,11 +1028,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml index 6212f68b30a..69966043768 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1014,11 +1028,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml index 49676be0a50..06449c47d1a 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1014,11 +1028,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml index d5997d48656..4b366b66779 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1031,11 +1045,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereHostVMGroupZonal.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereHostVMGroupZonal.yaml index da129048ede..c24cc12924a 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereHostVMGroupZonal.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereHostVMGroupZonal.yaml @@ -910,11 +910,16 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -928,17 +933,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1018,7 +1032,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup @@ -1027,6 +1040,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml index 1f0716b899d..13d5489d675 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml @@ -910,7 +910,12 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of + region that is used for this failure domain. + The current available options are "", ComputeCluster + and Datacenter. + maxLength: 80 + minLength: 1 type: string server: description: server is the fully-qualified domain @@ -924,17 +929,26 @@ spec: domain using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and - vm group ... + description: affinityGroup holds the names + of the host and vm groups that will be + used for HostGroup based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name - of the Host group + of the Host group within vcenter for + this failure domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name - of the VM group + of the VM group within vCenter for + this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name + of the vm host rule within vCenter + for this failure domain maxLength: 80 type: string type: object @@ -1014,11 +1028,12 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index ab086e48ce7..3692adfb05c 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -19395,18 +19395,23 @@ func schema_openshift_api_config_v1_VSphereFailureDomainAffinityGroup(ref common SchemaProps: spec.SchemaProps{ Type: []string{"object"}, Properties: map[string]spec.Schema{ - "vmGroupName": { + "vmGroup": { SchemaProps: spec.SchemaProps{ - Description: "VMGroupName is the name of the VM group", - Default: "", + Description: "VMGroupName is the name of the VM group within vCenter for this failure domain", Type: []string{"string"}, Format: "", }, }, - "hostGroupName": { + "hostGroup": { SchemaProps: spec.SchemaProps{ - Description: "HostGroupName is the name of the Host group", - Default: "", + Description: "HostGroupName is the name of the Host group within vcenter for this failure domain", + Type: []string{"string"}, + Format: "", + }, + }, + "vmHostRule": { + SchemaProps: spec.SchemaProps{ + Description: "VMHostRule is the name of the vm host rule within vCenter for this failure domain", Type: []string{"string"}, Format: "", }, @@ -19442,9 +19447,9 @@ func schema_openshift_api_config_v1_VSpherePlatformFailureDomainSpec(ref common. }, "regionType": { SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", + Description: "regionType defines the type of region that is used for this failure domain. The current available options are \"\", ComputeCluster and Datacenter.", + Type: []string{"string"}, + Format: "", }, }, "zone": { @@ -19458,7 +19463,6 @@ func schema_openshift_api_config_v1_VSpherePlatformFailureDomainSpec(ref common. "zoneType": { SchemaProps: spec.SchemaProps{ Description: "zoneType defines the type of zone that is used for this failure domain. The current available options are \"\", HostGroup and ComputeCluster.", - Default: "", Type: []string{"string"}, Format: "", }, @@ -19479,7 +19483,7 @@ func schema_openshift_api_config_v1_VSpherePlatformFailureDomainSpec(ref common. }, }, }, - Required: []string{"name", "region", "regionType", "server", "topology"}, + Required: []string{"name", "region", "server", "topology"}, }, }, Dependencies: []string{ @@ -19908,7 +19912,7 @@ func schema_openshift_api_config_v1_VSpherePlatformTopology(ref common.Reference }, "affinityGroup": { SchemaProps: spec.SchemaProps{ - Description: "affinityGroup is the host and vm group ...", + Description: "affinityGroup holds the names of the host and vm groups that will be used for HostGroup based failure domains.", Default: map[string]interface{}{}, Ref: ref("github.com/openshift/api/config/v1.VSphereFailureDomainAffinityGroup"), }, diff --git a/openapi/openapi.json b/openapi/openapi.json index 4a5423bc17d..b9217c07586 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -10539,15 +10539,17 @@ "com.github.openshift.api.config.v1.VSphereFailureDomainAffinityGroup": { "type": "object", "properties": { - "hostGroupName": { - "description": "HostGroupName is the name of the Host group", - "type": "string", - "default": "" + "hostGroup": { + "description": "HostGroupName is the name of the Host group within vcenter for this failure domain", + "type": "string" }, - "vmGroupName": { - "description": "VMGroupName is the name of the VM group", - "type": "string", - "default": "" + "vmGroup": { + "description": "VMGroupName is the name of the VM group within vCenter for this failure domain", + "type": "string" + }, + "vmHostRule": { + "description": "VMHostRule is the name of the vm host rule within vCenter for this failure domain", + "type": "string" } } }, @@ -10557,7 +10559,6 @@ "required": [ "name", "region", - "regionType", "server", "topology" ], @@ -10573,8 +10574,8 @@ "default": "" }, "regionType": { - "type": "string", - "default": "" + "description": "regionType defines the type of region that is used for this failure domain. The current available options are \"\", ComputeCluster and Datacenter.", + "type": "string" }, "server": { "description": "server is the fully-qualified domain name or the IP address of the vCenter server.", @@ -10593,8 +10594,7 @@ }, "zoneType": { "description": "zoneType defines the type of zone that is used for this failure domain. The current available options are \"\", HostGroup and ComputeCluster.", - "type": "string", - "default": "" + "type": "string" } } }, @@ -10785,7 +10785,7 @@ ], "properties": { "affinityGroup": { - "description": "affinityGroup is the host and vm group ...", + "description": "affinityGroup holds the names of the host and vm groups that will be used for HostGroup based failure domains.", "default": {}, "$ref": "#/definitions/com.github.openshift.api.config.v1.VSphereFailureDomainAffinityGroup" }, diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml index 5bf2d5b0ab7..d5f0607b4b4 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -650,17 +654,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -746,7 +758,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -754,6 +765,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml index 6797e129eff..0f1f309d171 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml @@ -629,7 +629,11 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -646,17 +650,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -742,10 +754,11 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml index 31f583375ba..4ea4d6f330e 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -650,17 +654,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -746,7 +758,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -754,6 +765,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name diff --git a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml index 9fedc3d9e3b..1e49f42eb08 100644 --- a/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml @@ -629,11 +629,15 @@ spec: minLength: 1 type: string regionType: - default: "" + description: regionType defines the type of region that + is used for this failure domain. The current available + options are "", ComputeCluster and Datacenter. enum: - "" - ComputeCluster - Datacenter + maxLength: 80 + minLength: 1 type: string server: anyOf: @@ -650,17 +654,25 @@ spec: using vSphere constructs properties: affinityGroup: - description: affinityGroup is the host and vm group - ... + description: affinityGroup holds the names of the + host and vm groups that will be used for HostGroup + based failure domains. properties: - hostGroupName: + hostGroup: description: HostGroupName is the name of the - Host group + Host group within vcenter for this failure + domain maxLength: 80 type: string - vmGroupName: + vmGroup: description: VMGroupName is the name of the - VM group + VM group within vCenter for this failure domain + maxLength: 80 + type: string + vmHostRule: + description: VMHostRule is the name of the vm + host rule within vCenter for this failure + domain maxLength: 80 type: string type: object @@ -746,7 +758,6 @@ spec: minLength: 1 type: string zoneType: - default: "" description: zoneType defines the type of zone that is used for this failure domain. The current available options are "", HostGroup and ComputeCluster. @@ -754,6 +765,8 @@ spec: - "" - HostGroup - ComputeCluster + maxLength: 80 + minLength: 1 type: string required: - name