Skip to content

Commit

Permalink
misc updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcpowermac
jcpowermac committed Aug 28, 2024
1 parent 1938c1c commit 9110f86
Show file tree
Hide file tree
Showing 31 changed files with 629 additions and 264 deletions.
8 changes: 0 additions & 8 deletions config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand All @@ -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
Expand All @@ -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: {}
Expand Down
31 changes: 19 additions & 12 deletions config/v1/types_infrastructure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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.
Expand Down
29 changes: 21 additions & 8 deletions ...nerated.crd-manifests/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -746,14 +758,15 @@ 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.
enum:
- ""
- HostGroup
- ComputeCluster
maxLength: 80
minLength: 1
type: string
required:
- name
Expand Down
29 changes: 21 additions & 8 deletions ...v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
29 changes: 21 additions & 8 deletions ...ted.crd-manifests/0000_10_config-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -746,14 +758,15 @@ 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.
enum:
- ""
- HostGroup
- ComputeCluster
maxLength: 80
minLength: 1
type: string
required:
- name
Expand Down
29 changes: 21 additions & 8 deletions ...ed.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -746,14 +758,15 @@ 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.
enum:
- ""
- HostGroup
- ComputeCluster
maxLength: 80
minLength: 1
type: string
required:
- name
Expand Down
Loading

0 comments on commit 9110f86

Please sign in to comment.