-
Notifications
You must be signed in to change notification settings - Fork 577
CORS-4157: AWS, Azure: Add IPFamily to the PlatformStatus within Infra CR #2499
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.
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
Merged
openshift-merge-bot
merged 1 commit into
openshift:master
from
sadasu:aws-azure-gcp-dual-stack
Oct 23, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
297 changes: 297 additions & 0 deletions
297
config/v1/tests/infrastructures.config.openshift.io/AWSDualStackInstall.yaml
This file contains hidden or 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,297 @@ | ||
| apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this | ||
| name: "Infrastructure" | ||
| crdName: infrastructures.config.openshift.io | ||
| featureGates: | ||
| - AWSDualStackInstall | ||
| 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: {} | ||
| onUpdate: | ||
| - name: ipFamily should default to `IPv4` when not specified in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| type: AWS | ||
| expected: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| cpuPartitioning: None | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| cloudLoadBalancerConfig: | ||
| dnsType: PlatformDefault | ||
| ipFamily: IPv4 | ||
| region: us-east-1 | ||
| type: AWS | ||
| - name: Should be able to set ipFamily to `DualStackIPv6Primary` in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: DualStackIPv6Primary | ||
| type: AWS | ||
| expected: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| cpuPartitioning: None | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| cloudLoadBalancerConfig: | ||
| dnsType: PlatformDefault | ||
| ipFamily: DualStackIPv6Primary | ||
| region: us-east-1 | ||
| type: AWS | ||
| - name: Should be able to set ipFamily to `DualStackIPv4Primary` in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: DualStackIPv4Primary | ||
| type: AWS | ||
| expected: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| cpuPartitioning: None | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| cloudLoadBalancerConfig: | ||
| dnsType: PlatformDefault | ||
| ipFamily: DualStackIPv4Primary | ||
| region: us-east-1 | ||
| type: AWS | ||
| - name: Should not be able to set ipFamily to invalid value in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: InvalidValue | ||
| type: AWS | ||
| expectedStatusError: "platformStatus.aws.ipFamily: Unsupported value: \"InvalidValue\": supported values: \"IPv4\", \"DualStackIPv6Primary\", \"DualStackIPv4Primary\"" | ||
| - name: Should not allow changing the immutable ipFamily field in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: IPv4 | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: DualStackIPv6Primary | ||
| type: AWS | ||
| expectedStatusError: "status.platformStatus.aws.ipFamily: Invalid value: \"string\": ipFamily is immutable once set" | ||
| - name: Should allow setting the same ipFamily value in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: DualStackIPv6Primary | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: DualStackIPv6Primary | ||
| type: AWS | ||
| expected: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| cpuPartitioning: None | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| cloudLoadBalancerConfig: | ||
| dnsType: PlatformDefault | ||
| ipFamily: DualStackIPv6Primary | ||
| region: us-east-1 | ||
| type: AWS | ||
| - name: Should not be able to unset ipFamily once it has been set in AWS platform status | ||
| initial: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| aws: {} | ||
| type: AWS | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| ipFamily: DualStackIPv4Primary | ||
| type: AWS | ||
| updated: | | ||
| apiVersion: config.openshift.io/v1 | ||
| kind: Infrastructure | ||
| spec: | ||
| platformSpec: | ||
| type: AWS | ||
| aws: {} | ||
| status: | ||
| controlPlaneTopology: HighlyAvailable | ||
| infrastructureTopology: HighlyAvailable | ||
| platform: AWS | ||
| platformStatus: | ||
| aws: | ||
| region: us-east-1 | ||
| type: AWS | ||
| expectedStatusError: "status.platformStatus.aws.ipFamily: Invalid value: \"string\": ipFamily is immutable once set" | ||
This file contains hidden or 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
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.
Oh nice, so is this the optionalOldSelf rule on the field itself triggering here? I guess it's the combination of that rule and the defaulting (which is a change of value)