SPLAT-1452: Changed vcenter MaxItems to be 3 for TechPreview. #1842
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this | ||
| name: "Infrastructure" | ||
| crdName: infrastructures.config.openshift.io | ||
| featureGate: VSphereMultiVCenters | ||
| 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: {} | ||
| - name: Should be able to pass more than 1 entries to vcenters in the vsphere platform spec | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| cloudConfig: | ||
| key: config | ||
| name: cloud-provider-config | ||
| platformSpec: | ||
| type: VSphere | ||
| vsphere: | ||
| failureDomains: | ||
| - name: generated-failure-domain | ||
| region: generated-region | ||
| server: server1.dev.cluster.com | ||
| topology: | ||
| computeCluster: /IBMCloud/host/vcs-8e-workload | ||
| datacenter: IBMCloud | ||
| datastore: /IBMCloud/datastore/mdcnc-ds-shared | ||
| networks: | ||
| - ocp-ci-seg-13 | ||
| resourcePool: /IBMCloud/host/vcs-8e-workload/Resources | ||
| template: /IBMCloud/vm/ngirard-dev-rqh5s-rhcos-generated-region-generated-zone | ||
| zone: generated-zone | ||
| nodeNetworking: | ||
| external: {} | ||
| internal: {} | ||
| vcenters: | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: server1.dev.cluster.com | ||
| - datacenters: | ||
| - IBMCloud2 | ||
| port: 443 | ||
| server: server2.dev.cluster.com | ||
| expected: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| cloudConfig: | ||
| key: config | ||
| name: cloud-provider-config | ||
| platformSpec: | ||
| type: VSphere | ||
| vsphere: | ||
| failureDomains: | ||
| - name: generated-failure-domain | ||
| region: generated-region | ||
| server: server1.dev.cluster.com | ||
| topology: | ||
| computeCluster: /IBMCloud/host/vcs-8e-workload | ||
| datacenter: IBMCloud | ||
| datastore: /IBMCloud/datastore/mdcnc-ds-shared | ||
| networks: | ||
| - ocp-ci-seg-13 | ||
| resourcePool: /IBMCloud/host/vcs-8e-workload/Resources | ||
| template: /IBMCloud/vm/ngirard-dev-rqh5s-rhcos-generated-region-generated-zone | ||
| zone: generated-zone | ||
| nodeNetworking: | ||
| external: {} | ||
| internal: {} | ||
| vcenters: | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: server1.dev.cluster.com | ||
| - datacenters: | ||
| - IBMCloud2 | ||
| port: 443 | ||
| server: server2.dev.cluster.com | ||
| onUpdate: | ||
| - name: Should be able to set vCenters to multiple | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| cloudConfig: | ||
| key: config | ||
| name: cloud-provider-config | ||
| platformSpec: | ||
| type: VSphere | ||
| vsphere: | ||
| vcenters: | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: vcs8e-vc.ocp2.dev.cluster.com | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| cloudConfig: | ||
| key: config | ||
| name: cloud-provider-config | ||
| platformSpec: | ||
| type: VSphere | ||
| vsphere: | ||
| vcenters: | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: vcs8e-vc.ocp2.dev.cluster.com | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: v8c-2-vcenter.ocp2.dev.cluster.com | ||
| expected: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| cloudConfig: | ||
| key: config | ||
| name: cloud-provider-config | ||
| platformSpec: | ||
| type: VSphere | ||
| vsphere: | ||
| vcenters: | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: vcs8e-vc.ocp2.dev.cluster.com | ||
| - datacenters: | ||
| - IBMCloud | ||
| port: 443 | ||
| server: v8c-2-vcenter.ocp2.dev.cluster.com |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1343,8 +1343,9 @@ type VSpherePlatformSpec struct { | |
| // --- | ||
| // + If VCenters is not defined use the existing cloud-config configmap defined | ||
| // + in openshift-config. | ||
| // +kubebuilder:validation:MinItems=0 | ||
| // +openshift:validation:FeatureGateAwareMaxItems:featureGate="",maxItems=1 | ||
| // +openshift:validation:FeatureGateAwareMaxItems:featureGate=VSphereMultiVCenters,maxItems=3 | ||
|
There was a problem hiding this comment. Does this feature gate already exist? There was a problem hiding this comment. We had the variable before where we capped it to 1 max. We never supported multiple vCenters. This feature gate is to allow us to provide that function and use the gate in multiple operators where today we are limiting vCenter count to 1. In fact, multiple operators have hard coded limit set to one. With this feature gate, we'll be updating those logic to now allow multiple if this new FeatureGate is enabled. There was a problem hiding this comment. The feature gate will need to be initialised in There was a problem hiding this comment. @JoelSpeed , yes, I updated that file in this PR already. Is that the change you are thinking or did I miss something? There was a problem hiding this comment. Apparently I just couldn't find it, ignore me |
||
| // +listType=atomic | ||
| // +optional | ||
| VCenters []VSpherePlatformVCenterSpec `json:"vcenters,omitempty"` | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -870,7 +870,6 @@ spec: | |
| - datacenters | ||
| - server | ||
| type: object | ||
| minItems: 0 | ||
| type: array | ||
| x-kubernetes-list-type: atomic | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -870,7 +870,6 @@ spec: | |
| - datacenters | ||
| - server | ||
| type: object | ||
| minItems: 0 | ||
| type: array | ||
| x-kubernetes-list-type: atomic | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -870,7 +870,6 @@ spec: | |
| - datacenters | ||
| - server | ||
| type: object | ||
| minItems: 0 | ||
| type: array | ||
| x-kubernetes-list-type: atomic | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -886,7 +886,6 @@ spec: | |
| - datacenters | ||
| - server | ||
| type: object | ||
| minItems: 0 | ||
| type: array | ||
| x-kubernetes-list-type: atomic | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vr4manta just curious why only three? Is there a documented maximum?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, is in the epic. Not sure the reasoning for 3 being the max, but for now, that's what we have it being set to.