Skip to content

Commit ad9f718

Browse files
committed
Removed VSphereMultiVCenters feature gate
1 parent 8fcc4e7 commit ad9f718

38 files changed

+24
-5149
lines changed

Diff for: config/v1/tests/infrastructures.config.openshift.io/VSphereMultiVCenters.yaml

-462
This file was deleted.

Diff for: config/v1/types_infrastructure.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -1557,8 +1557,7 @@ type VSpherePlatformSpec struct {
15571557
// + If VCenters is not defined use the existing cloud-config configmap defined
15581558
// + in openshift-config.
15591559
// +kubebuilder:validation:MinItems=0
1560-
// +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
1561-
// +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiVCenters,maxItems=3
1560+
// +kubebuilder:validation:MaxItems=3
15621561
// +kubebuilder:validation:XValidation:rule="size(self) != size(oldSelf) ? size(oldSelf) == 0 && size(self) < 2 : true",message="vcenters cannot be added or removed once set"
15631562
// +listType=atomic
15641563
// +optional

Diff for: config/v1/zz_generated.featuregated-crd-manifests.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ infrastructures.config.openshift.io:
323323
- NutanixMultiSubnets
324324
- VSphereHostVMGroupZonal
325325
- VSphereMultiNetworks
326-
- VSphereMultiVCenters
327326
FilenameOperatorName: config-operator
328327
FilenameOperatorOrdering: "01"
329328
FilenameRunLevel: "0000_10"

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml

+1-1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/BareMetalLoadBalancer.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DualReplica.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPClusterHostedDNS.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPCustomAPIEndpoints.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/GCPLabelsTags.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/HighlyAvailableArbiter.yaml

+1
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

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/NutanixMultiSubnets.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -991,6 +991,7 @@ spec:
991991
- datacenters
992992
- server
993993
type: object
994+
maxItems: 3
994995
minItems: 0
995996
type: array
996997
x-kubernetes-list-type: atomic

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereHostVMGroupZonal.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -997,6 +997,7 @@ spec:
997997
- datacenters
998998
- server
999999
type: object
1000+
maxItems: 3
10001001
minItems: 0
10011002
type: array
10021003
x-kubernetes-list-type: atomic

Diff for: config/v1/zz_generated.featuregated-crd-manifests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ spec:
987987
- datacenters
988988
- server
989989
type: object
990+
maxItems: 3
990991
minItems: 0
991992
type: array
992993
x-kubernetes-list-type: atomic

0 commit comments

Comments
 (0)