Skip to content

Commit

Permalink
Nutanix: allow multi-subnets in Machine providerSpec and failureDomai…
Browse files Browse the repository at this point in the history 
…n configuration
  • Loading branch information
@yanhua121
yanhua121 committed Oct 29, 2024
1 parent 684b2b1 commit 66fbeb9
Show file tree
Hide file tree
Showing 35 changed files with 35 additions and 139 deletions.
4 changes: 1 addition & 3 deletions config/v1/types_infrastructure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1769,9 +1769,7 @@ type NutanixFailureDomain struct {
// obtained from the Prism Central console or using the prism_central API.
// +kubebuilder:validation:Required
// +kubebuilder:validation:MinItems=1
// +kubebuilder:validation:MaxItems=1
// +listType=map
// +listMapKey=type
// +listType=atomic
Subnets []NutanixResourceIdentifier `json:"subnets"`
}

Expand Down
5 changes: 1 addition & 4 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 @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 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 @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 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 @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 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 @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...nerated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...ated-crd-manifests/infrastructures.config.openshift.io/VSphereControlPlaneMachineSet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ....featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ....featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...erated.crd-manifests/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...ed.crd-manifests/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...d.crd-manifests/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...egated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...rd-manifests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...-manifests/controllerconfigs.machineconfiguration.openshift.io/BareMetalLoadBalancer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...rd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPClusterHostedDNS.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...ated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/GCPLabelsTags.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...ts/controllerconfigs.machineconfiguration.openshift.io/VSphereControlPlaneMachineSet.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...d-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions ...d-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiVCenters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,9 @@ spec:
when type is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name''
? has(self.name) : !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
5 changes: 1 addition & 4 deletions openapi/generated_openapi/zz_generated.openapi.go
View file

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

5 changes: 1 addition & 4 deletions openapi/openapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8321,10 +8321,7 @@
"default": {},
"$ref": "#/definitions/com.github.openshift.api.config.v1.NutanixResourceIdentifier"
},
"x-kubernetes-list-map-keys": [
"type"
],
"x-kubernetes-list-type": "map"
"x-kubernetes-list-type": "atomic"
}
}
},
Expand Down
5 changes: 1 addition & 4 deletions payload-manifests/crds/0000_10_config-operator_01_infrastructures-CustomNoUpgrade.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,9 @@ spec:
is Name, and forbidden otherwise
rule: 'has(self.type) && self.type == ''Name'' ? has(self.name)
: !has(self.name)'
maxItems: 1
minItems: 1
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
x-kubernetes-list-type: atomic
required:
- cluster
- name
Expand Down
Loading

0 comments on commit 66fbeb9

Please sign in to comment.