Skip to content

SPLAT-1127: extend API to enable vSphere control plane machineset #1539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 24, 2023
Merged

SPLAT-1127: extend API to enable vSphere control plane machineset #1539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e435a7
define VSphereFailureDomain for use by control plane machinesets
rvanderp3 Sep 12, 2023
c7b7f25
add template to infrastructure vSphere platform topology
rvanderp3 Sep 12, 2023
c2f724a
create vSphere control plane machienset feature gate
rvanderp3 Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions config/v1/0000_10_config-operator_01_infrastructure-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@ spec:
maxLength: 2048
pattern: ^/.*?/host/.*?/Resources.*
type: string
template:
description: "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 When 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 /<datacenter>/vm/test-rhcos-region1-zonea."
maxLength: 2048
minLength: 1
pattern: ^/.*?/vm/.*?
type: string
required:
- computeCluster
- datacenter
Expand Down
6 changes: 6 additions & 0 deletions config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@ spec:
maxLength: 2048
pattern: ^/.*?/host/.*?/Resources.*
type: string
template:
description: "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 When 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 /<datacenter>/vm/test-rhcos-region1-zonea."
maxLength: 2048
minLength: 1
pattern: ^/.*?/vm/.*?
type: string
required:
- computeCluster
- datacenter
Expand Down
10 changes: 10 additions & 0 deletions config/v1/feature_gates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,14 @@ var (
ResponsiblePerson: "miciah",
OwningProduct: ocpSpecific,
}

FeatureGateVSphereControlPlaneMachineset = FeatureGateName("VSphereControlPlaneMachineSet")
vSphereControlPlaneMachineset = FeatureGateDescription{
FeatureGateAttributes: FeatureGateAttributes{
Name: FeatureGateVSphereControlPlaneMachineset,
},
OwningJiraComponent: "splat",
ResponsiblePerson: "rvanderp3",
OwningProduct: ocpSpecific,
}
)
1 change: 1 addition & 0 deletions config/v1/types_feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
with(vSphereStaticIPs).
with(routeExternalCertificate).
with(automatedEtcdBackup).
with(vSphereControlPlaneMachineset).
without(machineAPIOperatorDisableMachineHealthCheckController).
with(adminNetworkPolicy).
with(dnsNameResolver).
Expand Down
28 changes: 22 additions & 6 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,22 @@ type VSpherePlatformTopology struct {
// +kubebuilder:validation:Pattern=`^/.*?/vm/.*?`
// +optional
Folder string `json:"folder,omitempty"`

// 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.
//
// When 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 /<datacenter>/vm/test-rhcos-region1-zonea.
// +openshift:enable:FeatureSets=CustomNoUpgrade;TechPreviewNoUpgrade
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=2048
// +kubebuilder:validation:Pattern=`^/.*?/vm/.*?`
Comment on lines +1024 to +1026
Copy link
Contributor

@JoelSpeed JoelSpeed Sep 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These validations should be explained in prose within the godoc.

Do we run the same regex validation against the template field on the providerSpec?

Copy link
Contributor Author

@rvanderp3 rvanderp3 Sep 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we will perform that validation in the cpmso

Copy link
Contributor Author

@rvanderp3 rvanderp3 Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validation for this has been added to the cpmso

// +optional
Template string `json:"template,omitempty"`
}

// VSpherePlatformVCenterSpec stores the vCenter connection fields.
Expand Down Expand Up @@ -1209,13 +1225,13 @@ type IBMCloudPlatformStatus struct {
// for the cluster's base domain
DNSInstanceCRN string `json:"dnsInstanceCRN,omitempty"`

// serviceEndpoints is a list of custom endpoints which will override the default
// service endpoints of an IBM Cloud service. These endpoints are consumed by
// serviceEndpoints is a list of custom endpoints which will override the default
// service endpoints of an IBM Cloud service. These endpoints are consumed by
// components within the cluster to reach the respective IBM Cloud Services.
// +listType=map
// +listMapKey=name
// +optional
ServiceEndpoints []IBMCloudServiceEndpoint `json:"serviceEndpoints,omitempty"`
// +listType=map
// +listMapKey=name
// +optional
ServiceEndpoints []IBMCloudServiceEndpoint `json:"serviceEndpoints,omitempty"`
}

// KubevirtPlatformSpec holds the desired state of the kubevirt infrastructure provider.
Expand Down
1 change: 1 addition & 0 deletions config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions machine/.codegen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
schemapatch:
requiredFeatureSets:
- ""
- "Default"
- "TechPreviewNoUpgrade"
- "CustomNoUpgrade"
swaggerdocs:
commentPolicy: Warn
Loading