Skip to content

Commit ec925ab

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2231 from vr4manta/SPLAT-2072
SPLAT-2072: Removed VSphereMultiVCenters feature gate
2 parents 108fecf + 31cf428 commit ec925ab

File tree

40 files changed

+26
-5149
lines changed

40 files changed

+26
-5149
lines changed

‎config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml

Lines changed: 0 additions & 462 deletions
This file was deleted.

‎config/v1/types_infrastructure.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,8 +1559,7 @@ type VSpherePlatformSpec struct {
15591559
// + If VCenters is not defined use the existing cloud-config configmap defined
15601560
// + in openshift-config.
15611561
// +kubebuilder:validation:MinItems=0
1562-
// +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
1563-
// +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiVCenters,maxItems=3
1562+
// +kubebuilder:validation:MaxItems=3
15641563
// +kubebuilder:validation:XValidation:rule="size(self) != size(oldSelf) ? size(oldSelf) == 0 && size(self) < 2 : true",message="vcenters cannot be added or removed once set"
15651564
// +listType=atomic
15661565
// +optional

‎config/v1/zz_generated.featuregated-crd-manifests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ infrastructures.config.openshift.io:
325325
- NutanixMultiSubnets
326326
- VSphereHostVMGroupZonal
327327
- VSphereMultiNetworks
328-
- VSphereMultiVCenters
329328
FilenameOperatorName: config-operator
330329
FilenameOperatorOrdering: "01"
331330
FilenameRunLevel: "0000_10"

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ spec:
988988
- datacenters
989989
- server
990990
type: object
991-
maxItems: 1
991+
maxItems: 3
992992
minItems: 0
993993
type: array
994994
x-kubernetes-list-type: atomic

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ spec:
986986
- datacenters
987987
- server
988988
type: object
989+
maxItems: 3
989990
minItems: 0
990991
type: array
991992
x-kubernetes-list-type: atomic

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ spec:
986986
- datacenters
987987
- server
988988
type: object
989+
maxItems: 3
989990
minItems: 0
990991
type: array
991992
x-kubernetes-list-type: atomic

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DualReplica.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ spec:
986986
- datacenters
987987
- server
988988
type: object
989+
maxItems: 3
989990
minItems: 0
990991
type: array
991992
x-kubernetes-list-type: atomic

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,7 @@ spec:
10481048
- datacenters
10491049
- server
10501050
type: object
1051+
maxItems: 3
10511052
minItems: 0
10521053
type: array
10531054
x-kubernetes-list-type: atomic

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ spec:
986986
- datacenters
987987
- server
988988
type: object
989+
maxItems: 3
989990
minItems: 0
990991
type: array
991992
x-kubernetes-list-type: atomic

‎config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPCustomAPIEndpoints.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -986,6 +986,7 @@ spec:
986986
- datacenters
987987
- server
988988
type: object
989+
maxItems: 3
989990
minItems: 0
990991
type: array
991992
x-kubernetes-list-type: atomic

0 commit comments

Comments
 (0)