From 66fbeb9d91ceb49c183f82cd334b2905f32bac5b Mon Sep 17 00:00:00 2001 From: Yanhua Li Date: Mon, 28 Oct 2024 12:57:40 -0400 Subject: [PATCH] Nutanix: allow multi-subnets in Machine providerSpec and failureDomain configuration --- config/v1/types_infrastructure.go | 4 +--- ...nfig-operator_01_infrastructures-CustomNoUpgrade.crd.yaml | 5 +---- ...00_10_config-operator_01_infrastructures-Default.crd.yaml | 5 +---- ...-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml | 5 +---- ...operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml | 5 +---- .../infrastructures.config.openshift.io/AAA_ungated.yaml | 5 +---- .../AWSClusterHostedDNS.yaml | 5 +---- .../BareMetalLoadBalancer.yaml | 5 +---- .../GCPClusterHostedDNS.yaml | 5 +---- .../infrastructures.config.openshift.io/GCPLabelsTags.yaml | 5 +---- .../VSphereControlPlaneMachineSet.yaml | 5 +---- .../VSphereMultiNetworks.yaml | 5 +---- .../VSphereMultiVCenters.yaml | 5 +---- ...hine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml | 5 +---- ...0_80_machine-config_01_controllerconfigs-Default.crd.yaml | 5 +---- ...-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml | 5 +---- ...config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml | 5 +---- .../AAA_ungated.yaml | 5 +---- .../AWSClusterHostedDNS.yaml | 5 +---- .../BareMetalLoadBalancer.yaml | 5 +---- .../GCPClusterHostedDNS.yaml | 5 +---- .../GCPLabelsTags.yaml | 5 +---- .../VSphereControlPlaneMachineSet.yaml | 5 +---- .../VSphereMultiNetworks.yaml | 5 +---- .../VSphereMultiVCenters.yaml | 5 +---- openapi/generated_openapi/zz_generated.openapi.go | 5 +---- openapi/openapi.json | 5 +---- ...nfig-operator_01_infrastructures-CustomNoUpgrade.crd.yaml | 5 +---- ...00_10_config-operator_01_infrastructures-Default.crd.yaml | 5 +---- ...-operator_01_infrastructures-DevPreviewNoUpgrade.crd.yaml | 5 +---- ...operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml | 5 +---- ...hine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml | 5 +---- ...0_80_machine-config_01_controllerconfigs-Default.crd.yaml | 5 +---- ...-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml | 5 +---- ...config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml | 5 +---- 35 files changed, 35 insertions(+), 139 deletions(-) diff --git a/config/v1/types_infrastructure.go b/config/v1/types_infrastructure.go index 0daa62d3096..13d68dfd6f6 100644 --- a/config/v1/types_infrastructure.go +++ b/config/v1/types_infrastructure.go @@ -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"` } 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 6b66f8b9b26..ca7debcc1a4 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 @@ -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 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 f2f1d4fb836..1d26d311d3c 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 @@ -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 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 851694b04d9..306a2baa940 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 @@ -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 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 b82d69e723f..946742b95c5 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 @@ -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 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 4bb24a55924..7a66fe14ed0 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 @@ -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 diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml index 36b551289b9..64e96648855 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml @@ -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 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 65abe99b849..f82472b45b7 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 @@ -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 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 caac7748933..be8df7d349a 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 @@ -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 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 a068bb5766c..fcaaaabb8f9 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 @@ -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 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 dbeb8c46d21..a609fb1ec88 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 @@ -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 diff --git a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml index 8942727344f..9d61bcf62e8 100644 --- a/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml +++ b/config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml @@ -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 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 a583dd3912f..8e04f496fcc 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 @@ -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 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 989d964276f..a9a7a34ce5a 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 @@ -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 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 c30a63e3467..98a7f7a8227 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 @@ -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 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 ccce2d520cd..818d1b614cd 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 @@ -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 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 8fad75fc376..c1550504b11 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 @@ -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 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 7d665e58d10..f95a0dc9771 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 @@ -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 diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNS.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNS.yaml index 9a958f874e4..8f55093c8d5 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNS.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/AWSClusterHostedDNS.yaml @@ -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 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 cf1c8a3c34a..fb1c9a9f889 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 @@ -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 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 d220a3527a2..563ab05a938 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 @@ -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 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 5e6f013511e..97cfc3e84c5 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 @@ -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 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 2cbf737fae1..96b962dbf4d 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 @@ -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 diff --git a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml index a51375bf3ef..8d69222a1a7 100644 --- a/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml +++ b/machineconfiguration/v1/zz_generated.featuregated-crd-manifests/controllerconfigs.machineconfiguration.openshift.io/VSphereMultiNetworks.yaml @@ -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 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 63b15a49353..cbce2f7cc2e 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 @@ -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 diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 53d69dce110..ba1b168d5c3 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -15621,10 +15621,7 @@ func schema_openshift_api_config_v1_NutanixFailureDomain(ref common.ReferenceCal "subnets": { VendorExtensible: spec.VendorExtensible{ Extensions: spec.Extensions{ - "x-kubernetes-list-map-keys": []interface{}{ - "type", - }, - "x-kubernetes-list-type": "map", + "x-kubernetes-list-type": "atomic", }, }, SchemaProps: spec.SchemaProps{ diff --git a/openapi/openapi.json b/openapi/openapi.json index 4fe157bf21e..b8ee5c70f92 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -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" } } }, 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 6b66f8b9b26..ca7debcc1a4 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 @@ -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 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 f2f1d4fb836..1d26d311d3c 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 @@ -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 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 851694b04d9..306a2baa940 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 @@ -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 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 b82d69e723f..946742b95c5 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 @@ -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 diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml index 989d964276f..a9a7a34ce5a 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-CustomNoUpgrade.crd.yaml @@ -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 diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml index c30a63e3467..98a7f7a8227 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml @@ -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 diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml index ccce2d520cd..818d1b614cd 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-DevPreviewNoUpgrade.crd.yaml @@ -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 diff --git a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml index 8fad75fc376..c1550504b11 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-TechPreviewNoUpgrade.crd.yaml @@ -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