Skip to content

OCPBUGS-105407: Remove VSphereMultiNetworks feature gate #2975

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

Open
vr4manta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-105407: Remove VSphereMultiNetworks feature gate #2975

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
11 changes: 0 additions & 11 deletions config/v1/tests/infrastructures.config.openshift.io/VSphereMultiNetworks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- VSphereMultiNetworks
Comment thread
JoelSpeed marked this conversation as resolved.
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {} # No spec is required for a Infrastructure
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec: {}
Comment thread
JoelSpeed marked this conversation as resolved.
- name: Should be not be able to set 0 networks in the vsphere platform spec topology
expectedError: "spec.platformSpec.vsphere.failureDomains[0].topology.networks: Invalid value: 0: spec.platformSpec.vsphere.failureDomains[0].topology.networks in body should have at least 1 items"
initial: |
Expand Down
5 changes: 2 additions & 3 deletions config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,16 +1518,15 @@ type VSpherePlatformTopology struct {
ComputeCluster string `json:"computeCluster"`

// networks is the list of port group network names within this failure domain.
// If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
// Up to 10 network adapters may be defined.
// 10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
// https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
// The available networks (port groups) can be listed using
// `govc ls 'network/*'`
// Networks should be in the form of an absolute path:
// /<datacenter>/network/<portgroup>.
// +required
// +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1
// +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiNetworks,maxItems=10
// +kubebuilder:validation:MaxItems=10
// +kubebuilder:validation:MinItems=1
Comment thread
vr4manta marked this conversation as resolved.
// +listType=atomic
Networks []string `json:"networks"`
Expand Down
2 changes: 1 addition & 1 deletion ...v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
2 changes: 1 addition & 1 deletion ...-manifests/0000_10_config-operator_01_infrastructures-Hypershift-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
2 changes: 1 addition & 1 deletion ...ifests/0000_10_config-operator_01_infrastructures-Hypershift-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
2 changes: 1 addition & 1 deletion config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-OKD.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
2 changes: 1 addition & 1 deletion ...nifests/0000_10_config-operator_01_infrastructures-SelfManagedHA-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
2 changes: 1 addition & 1 deletion ...sts/0000_10_config-operator_01_infrastructures-SelfManagedHA-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
2 changes: 1 addition & 1 deletion ...ed.crd-manifests/0000_10_config-operator_01_infrastructures-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand Down
1 change: 0 additions & 1 deletion config/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ infrastructures.config.openshift.io:
- NutanixMultiSubnets
- OnPremDNSRecords
- VSphereHostVMGroupZonal
- VSphereMultiNetworks
- VSphereMultiVCenterDay2
FilenameOperatorName: config-operator
FilenameOperatorOrdering: "01"
Expand Down
4 changes: 2 additions & 2 deletions ...generated.featuregated-crd-manifests/infrastructures.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -719,7 +719,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 1
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...regated-crd-manifests/infrastructures.config.openshift.io/AWSClusterHostedDNSInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -718,6 +718,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/AWSDualStackInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -718,6 +718,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...featuregated-crd-manifests/infrastructures.config.openshift.io/AzureDualStackInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -718,6 +718,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...featuregated-crd-manifests/infrastructures.config.openshift.io/BGPBasedVIPManagement.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -718,6 +718,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...generated.featuregated-crd-manifests/infrastructures.config.openshift.io/DualReplica.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -718,6 +718,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...ted-crd-manifests/infrastructures.config.openshift.io/DyanmicServiceEndpointIBMCloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -780,6 +780,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...turegated-crd-manifests/infrastructures.config.openshift.io/GCPSovereignCloudInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -718,6 +718,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...rated.featuregated-crd-manifests/infrastructures.config.openshift.io/MutableTopology.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -733,6 +733,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 2 additions & 1 deletion ...d.featuregated-crd-manifests/infrastructures.config.openshift.io/NutanixMultiSubnets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ spec:
networks:
description: |-
networks is the list of port group network names within this failure domain.
If feature gate VSphereMultiNetworks is enabled, up to 10 network adapters may be defined.
Up to 10 network adapters may be defined.
10 is the maximum number of virtual network devices which may be attached to a VM as defined by:
https://configmax.esp.vmware.com/guest?vmwareproduct=vSphere&release=vSphere%208.0&categories=1-0
The available networks (port groups) can be listed using
Expand All @@ -723,6 +723,7 @@ spec:
/<datacenter>/network/<portgroup>.
items:
type: string
maxItems: 10
minItems: 1
type: array
x-kubernetes-list-type: atomic
Expand Down
Loading