Skip to content

WIP: OCPBUGS-66104: Add CloudDNSIPs to CloudLoadBalancerConfig #2718

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

WIP: OCPBUGS-66104: Add CloudDNSIPs to CloudLoadBalancerConfig #2718

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
173 changes: 173 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 @@ -247,3 +247,176 @@ tests:
- 10.10.10.20
type: AWS
expectedStatusError: "status.platformStatus.aws.cloudLoadBalancerConfig.clusterHosted.apiIntLoadBalancerIPs[2]: Duplicate value: \"10.10.10.20\""
- name: Should be able to set cloudDNSIPs when dnsType is ClusterHosted
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
aws: {}
type: AWS
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
type: AWS
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: AWS
aws: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
- 10.0.0.4
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: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
- 10.0.0.4
ipFamily: IPv4
type: AWS
- name: Should not accept cloudDNSIPs when dnsType is PlatformDefault
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:
cloudLoadBalancerConfig:
dnsType: PlatformDefault
cloudDNSIPs:
- 10.0.0.2
type: AWS
expectedStatusError: "status.platformStatus.aws.cloudLoadBalancerConfig: Invalid value: \"object\": cloudDNSIPs is permitted only when dnsType is ClusterHosted"
- name: Should not accept non-IP address values for cloudDNSIPs
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
aws: {}
type: AWS
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
type: AWS
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: AWS
aws: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- not-an-ip-address
type: AWS
expectedStatusError: "status.platformStatus.aws.cloudLoadBalancerConfig.cloudDNSIPs[1]: Invalid value: \"string\": value must be a valid IP address"
- name: Should not accept duplicate IP addresses in cloudDNSIPs
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
aws: {}
type: AWS
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
type: AWS
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: AWS
aws: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: AWS
platformStatus:
aws:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
- 10.0.0.2
type: AWS
expectedStatusError: "status.platformStatus.aws.cloudLoadBalancerConfig.cloudDNSIPs[2]: Duplicate value: \"10.0.0.2\""
173 changes: 173 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 @@ -247,3 +247,176 @@ tests:
- 10.10.10.20
type: Azure
expectedStatusError: "status.platformStatus.azure.cloudLoadBalancerConfig.clusterHosted.apiIntLoadBalancerIPs[2]: Duplicate value: \"10.10.10.20\""
- name: Should be able to set cloudDNSIPs when dnsType is ClusterHosted
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
azure: {}
type: Azure
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
type: Azure
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: Azure
azure: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
- 10.0.0.4
type: Azure
expected: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: Azure
azure: {}
status:
controlPlaneTopology: HighlyAvailable
cpuPartitioning: None
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
- 10.0.0.4
ipFamily: IPv4
type: Azure
- name: Should not accept cloudDNSIPs when dnsType is PlatformDefault
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
azure: {}
type: Azure
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure: {}
type: Azure
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: Azure
azure: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: PlatformDefault
cloudDNSIPs:
- 10.0.0.2
type: Azure
expectedStatusError: "status.platformStatus.azure.cloudLoadBalancerConfig: Invalid value: \"object\": cloudDNSIPs is permitted only when dnsType is ClusterHosted"
- name: Should not accept non-IP address values for cloudDNSIPs
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
azure: {}
type: Azure
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
type: Azure
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: Azure
azure: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- not-an-ip-address
type: Azure
expectedStatusError: "status.platformStatus.azure.cloudLoadBalancerConfig.cloudDNSIPs[1]: Invalid value: \"string\": value must be a valid IP address"
- name: Should not accept duplicate IP addresses in cloudDNSIPs
initial: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
azure: {}
type: Azure
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
type: Azure
updated: |
apiVersion: config.openshift.io/v1
kind: Infrastructure
spec:
platformSpec:
type: Azure
azure: {}
status:
controlPlaneTopology: HighlyAvailable
infrastructureTopology: HighlyAvailable
platform: Azure
platformStatus:
azure:
cloudLoadBalancerConfig:
dnsType: ClusterHosted
cloudDNSIPs:
- 10.0.0.2
- 10.0.0.3
- 10.0.0.2
type: Azure
expectedStatusError: "status.platformStatus.azure.cloudLoadBalancerConfig.cloudDNSIPs[2]: Duplicate value: \"10.0.0.2\""
Loading