Skip to content

SPLAT-1272: Add support for Nutanix failure domains #258

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
openshift-merge-bot merged 1 commit into from
Nov 30, 2023
Merged

SPLAT-1272: Add support for Nutanix failure domains #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ require (
github.com/google/uuid v1.3.0
github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.28.0
github.com/openshift/api v0.0.0-20231116140543-cee73515e337
github.com/openshift/client-go v0.0.0-20231024221206-506d798bc61c
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20231113113313-b6681f587761
github.com/openshift/api v0.0.0-20231120222239-b86761094ee3
github.com/openshift/client-go v0.0.0-20231121143148-910ca30a1a9a
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20231130130825-ea989e248004
github.com/openshift/library-go v0.0.0-20231003133513-3a0c1fc00519
github.com/spf13/pflag v1.0.5
k8s.io/api v0.28.2
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,12 +452,12 @@ github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA
github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c=
github.com/onsi/gomega v1.28.0/go.mod h1:A1H2JE76sI14WIP57LMKj7FVfCHx3g3BcZVjJG8bjX8=
github.com/openshift/api v0.0.0-20231116140543-cee73515e337 h1:NmgCTU3T6SUxvODjs7ls6KffF8KMLKgkuOGZi+UoKCY=
github.com/openshift/api v0.0.0-20231116140543-cee73515e337/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/client-go v0.0.0-20231024221206-506d798bc61c h1:xfag+wccUqc9EdrWsnprD6x5KG2WE+iKGFfFELCwwRA=
github.com/openshift/client-go v0.0.0-20231024221206-506d798bc61c/go.mod h1:3BkYp+FtKD2TypMD0nTPkVsxUaY4fJPLEMFMlOLtrJM=
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20231113113313-b6681f587761 h1:IZDQnLz+vx8Zko8ukY7YImdckJxcyz8xZZoyQn9U0Cc=
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20231113113313-b6681f587761/go.mod h1:ze/wAfXufoC+LizDEi7oD76Aj3HiV/TBQuXNiz9rd0Q=
github.com/openshift/api v0.0.0-20231120222239-b86761094ee3 h1:nLhV2lbWrJ3E3hx0/97G3ZZvppC67cNwo+CLp7/PAbA=
github.com/openshift/api v0.0.0-20231120222239-b86761094ee3/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
github.com/openshift/client-go v0.0.0-20231121143148-910ca30a1a9a h1:4FVrw8hz0Wb3izbf6JfOEK+pJTYpEvteRR73mCh2g/A=
github.com/openshift/client-go v0.0.0-20231121143148-910ca30a1a9a/go.mod h1:arApQobmOjZqtxw44TwnQdUCH+t9DgZ8geYPFqksHws=
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20231130130825-ea989e248004 h1:z5MmF35DnAa+HOX6AHMrGhkm7YXaKZAxrNL3JsYHJ1I=
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20231130130825-ea989e248004/go.mod h1:8U97lU5NyyrNKkVcG3zRXFbI33Z5D+GZYp6k4oHoT9k=
github.com/openshift/library-go v0.0.0-20231003133513-3a0c1fc00519 h1:i4tHhSfvDj0g0rmD6nHE+FtdLFEQyDWbkuRi8xs5SQ8=
github.com/openshift/library-go v0.0.0-20231003133513-3a0c1fc00519/go.mod h1:hl8bxWuFMM72N4YH7FKLGWtYhDz/A0xwvaa8Yr5fxYU=
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
Expand Down
22 changes: 21 additions & 1 deletion ..._30_control-plane-machine-set-operator_00_controlplanemachineset-customnoupgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,24 @@ spec:
zone:
description: Zone is the zone in which the GCP machine provider will create the VM.
type: string
nutanix:
description: nutanix configures failure domain information for the Nutanix platform.
type: array
items:
description: NutanixFailureDomainReference refers to the failure domain of the Nutanix platform.
type: object
required:
- name
properties:
name:
description: name of the failure domain in which the nutanix machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource.
type: string
maxLength: 64
minLength: 1
pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?'
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
openstack:
description: OpenStack configures failure domain information for the OpenStack platform.
type: array
Expand Down Expand Up @@ -285,7 +303,7 @@ spec:
- rule: '!has(self.availabilityZone) || !has(self.rootVolume) || has(self.rootVolume.availabilityZone)'
message: rootVolume.availabilityZone is required when availabilityZone is set
platform:
description: Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, and VSphere.
description: Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, VSphere and Nutanix.
type: string
enum:
- ""
Expand Down Expand Up @@ -328,6 +346,8 @@ spec:
message: gcp configuration is required when platform is GCP, and forbidden otherwise
- rule: 'has(self.platform) && self.platform == ''OpenStack'' ? has(self.openstack) : !has(self.openstack)'
message: openstack configuration is required when platform is OpenStack, and forbidden otherwise
- rule: 'has(self.platform) && self.platform == ''Nutanix'' ? has(self.nutanix) : !has(self.nutanix)'
message: nutanix configuration is required when platform is Nutanix, and forbidden otherwise
metadata:
description: 'ObjectMeta is the standard object metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata Labels are required to match the ControlPlaneMachineSet selector.'
type: object
Expand Down
22 changes: 21 additions & 1 deletion ...sts/0000_30_control-plane-machine-set-operator_00_controlplanemachineset-default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,24 @@ spec:
zone:
description: Zone is the zone in which the GCP machine provider will create the VM.
type: string
nutanix:
description: nutanix configures failure domain information for the Nutanix platform.
type: array
items:
description: NutanixFailureDomainReference refers to the failure domain of the Nutanix platform.
type: object
required:
- name
properties:
name:
description: name of the failure domain in which the nutanix machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource.
type: string
maxLength: 64
minLength: 1
pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?'
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
openstack:
description: OpenStack configures failure domain information for the OpenStack platform.
type: array
Expand Down Expand Up @@ -285,7 +303,7 @@ spec:
- rule: '!has(self.availabilityZone) || !has(self.rootVolume) || has(self.rootVolume.availabilityZone)'
message: rootVolume.availabilityZone is required when availabilityZone is set
platform:
description: Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, and VSphere.
description: Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, VSphere and Nutanix.
type: string
enum:
- ""
Expand Down Expand Up @@ -314,6 +332,8 @@ spec:
message: gcp configuration is required when platform is GCP, and forbidden otherwise
- rule: 'has(self.platform) && self.platform == ''OpenStack'' ? has(self.openstack) : !has(self.openstack)'
message: openstack configuration is required when platform is OpenStack, and forbidden otherwise
- rule: 'has(self.platform) && self.platform == ''Nutanix'' ? has(self.nutanix) : !has(self.nutanix)'
message: nutanix configuration is required when platform is Nutanix, and forbidden otherwise
metadata:
description: 'ObjectMeta is the standard object metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata Labels are required to match the ControlPlaneMachineSet selector.'
type: object
Expand Down
22 changes: 21 additions & 1 deletion ...ontrol-plane-machine-set-operator_00_controlplanemachineset-techpreviewnoupgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,24 @@ spec:
zone:
description: Zone is the zone in which the GCP machine provider will create the VM.
type: string
nutanix:
description: nutanix configures failure domain information for the Nutanix platform.
type: array
items:
description: NutanixFailureDomainReference refers to the failure domain of the Nutanix platform.
type: object
required:
- name
properties:
name:
description: name of the failure domain in which the nutanix machine provider will create the VM. Failure domains are defined in a cluster's config.openshift.io/Infrastructure resource.
type: string
maxLength: 64
minLength: 1
pattern: '[a-z0-9]([-a-z0-9]*[a-z0-9])?'
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
openstack:
description: OpenStack configures failure domain information for the OpenStack platform.
type: array
Expand Down Expand Up @@ -285,7 +303,7 @@ spec:
- rule: '!has(self.availabilityZone) || !has(self.rootVolume) || has(self.rootVolume.availabilityZone)'
message: rootVolume.availabilityZone is required when availabilityZone is set
platform:
description: Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, and VSphere.
description: Platform identifies the platform for which the FailureDomain represents. Currently supported values are AWS, Azure, GCP, OpenStack, VSphere and Nutanix.
type: string
enum:
- ""
Expand Down Expand Up @@ -328,6 +346,8 @@ spec:
message: gcp configuration is required when platform is GCP, and forbidden otherwise
- rule: 'has(self.platform) && self.platform == ''OpenStack'' ? has(self.openstack) : !has(self.openstack)'
message: openstack configuration is required when platform is OpenStack, and forbidden otherwise
- rule: 'has(self.platform) && self.platform == ''Nutanix'' ? has(self.nutanix) : !has(self.nutanix)'
message: nutanix configuration is required when platform is Nutanix, and forbidden otherwise
metadata:
description: 'ObjectMeta is the standard object metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata Labels are required to match the ControlPlaneMachineSet selector.'
type: object
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/controlplanemachinesetgenerator/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func (r *ControlPlaneMachineSetGeneratorReconciler) generateControlPlaneMachineS
return nil, fmt.Errorf("unable to generate control plane machine set spec: %w", err)
}
case configv1.NutanixPlatformType:
cpmsSpecApplyConfig, err = generateControlPlaneMachineSetNutanixSpec(logger, machines)
cpmsSpecApplyConfig, err = generateControlPlaneMachineSetNutanixSpec(logger, machines, machineSets, infrastructure)
if err != nil {
return nil, fmt.Errorf("unable to generate control plane machine set spec: %w", err)
}
Expand Down
Loading