Skip to content

CORS-4136, CORS-4157: Add Feature gates and update Infrastructure API for AWS, Azure and GCP Dual Stack support #2430

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CORS-4136, CORS-4157: Add Feature gates and update Infrastructure API for AWS, Azure and GCP Dual Stack support #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e1eb05
Add Featuregates for Dual Stack support on AWS, Azure and GCP
sadasu Jul 30, 2025
fb36988
API changes to set IPFamily within PlatformStatus of Infra CR
sadasu Aug 12, 2025
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
3 changes: 3 additions & 0 deletions config/v1/tests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ tests:
aws:
cloudLoadBalancerConfig:
dnsType: PlatformDefault
ipFamily: IPv4
type: AWS
- name: should be able to set dnsType to non-default value of `ClusterHosted`
initial: |
Expand All @@ -84,6 +85,7 @@ tests:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
ipFamily: IPv4
type: AWS
expected: |
apiVersion: config.openshift.io/v1
Expand All @@ -101,6 +103,7 @@ tests:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
ipFamily: IPv4
type: AWS
- name: Should not allow changing the immutable dnsType field
initial: |
Expand Down
3 changes: 3 additions & 0 deletions config/v1/tests/infrastructures.config.openshift.io/AWSClusterHostedDNSInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ tests:
aws:
cloudLoadBalancerConfig:
dnsType: PlatformDefault
ipFamily: IPv4
type: AWS
- name: should be able to set dnsType to non-default value of `ClusterHosted`
initial: |
Expand All @@ -84,6 +85,7 @@ tests:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
ipFamily: IPv4
type: AWS
expected: |
apiVersion: config.openshift.io/v1
Expand All @@ -101,6 +103,7 @@ tests:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
ipFamily: IPv4
type: AWS
- name: Should not allow changing the immutable dnsType field
initial: |
Expand Down
169 changes: 169 additions & 0 deletions config/v1/tests/infrastructures.config.openshift.io/AWSDualStackInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
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
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
aws: {}
type: AWS
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
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: {}
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
type: AWS
- name: should be able to set ipFamily to non-default value of `DualStack`
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:
ipFamily: DualStack
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: DualStack
type: AWS
- name: Should not allow changing the immutable ipFamily field
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
aws: {}
type: AWS
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
ipFamily: DualStack
type: AWS
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: AWS
aws: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
ipFamily: IPv4
type: AWS
expectedStatusError: "status.platformStatus.aws.ipFamily: Invalid value: \"string\": ipFamily is immutable once set"
- name: Should not accept random strings for IpFamily
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
aws: {}
type: AWS
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
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:
ipFamily: "OpenShift"
type: AWS
expectedStatusError: "status.platformStatus.aws.ipFamily: Unsupported value: \"OpenShift\": supported values: \"IPv4\", \"DualStack\""
3 changes: 3 additions & 0 deletions config/v1/tests/infrastructures.config.openshift.io/AzureClusterHostedDNSInstall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ tests:
azure:
cloudLoadBalancerConfig:
dnsType: PlatformDefault
ipFamily: IPv4
type: Azure
- name: should be able to set dnsType to non-default value of `ClusterHosted`
initial: |
Expand All @@ -84,6 +85,7 @@ tests:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
ipFamily: IPv4
type: Azure
expected: |
apiVersion: config.openshift.io/v1
Expand All @@ -101,6 +103,7 @@ tests:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
ipFamily: IPv4
type: Azure
- name: Should not allow changing the immutable dnsType field
initial: |
Expand Down
Loading