Skip to content

Commit 6266c16

Browse files
sadasusadasu
committed
Promote AWSClusterHostedDNSInstall to Default
This promotes AWS Cluster Hosted DNS feature from techpreview to available by default.
1 parent 02f6733 commit 6266c16

11 files changed

Lines changed: 453 additions & 13 deletions

‎config/v1/tests/infrastructures.config.openshift.io/AAA_ungated.yaml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w
22
name: "Infrastructure"
33
crdName: infrastructures.config.openshift.io
44
featureGates:
5-
- -AWSClusterHostedDNSInstall
5+
- -AzureClusterHostedDNSInstall
66
tests:
77
onCreate:
88
- name: Should be able to create a minimal Infrastructure
@@ -1692,6 +1692,8 @@ tests:
16921692
platform: AWS
16931693
platformStatus:
16941694
aws:
1695+
cloudLoadBalancerConfig:
1696+
dnsType: PlatformDefault
16951697
region: us-east-1
16961698
resourceTags:
16971699
- key: key with space
@@ -1711,6 +1713,8 @@ tests:
17111713
platform: AWS
17121714
platformStatus:
17131715
aws:
1716+
cloudLoadBalancerConfig:
1717+
dnsType: PlatformDefault
17141718
region: us-east-1
17151719
resourceTags:
17161720
- key: key with space
@@ -1730,6 +1734,8 @@ tests:
17301734
platform: AWS
17311735
platformStatus:
17321736
aws:
1737+
cloudLoadBalancerConfig:
1738+
dnsType: PlatformDefault
17331739
region: us-east-1
17341740
resourceTags:
17351741
- key: key with space
@@ -1757,6 +1763,8 @@ tests:
17571763
platform: AWS
17581764
platformStatus:
17591765
aws:
1766+
cloudLoadBalancerConfig:
1767+
dnsType: PlatformDefault
17601768
region: us-east-1
17611769
resourceTags:
17621770
- key: key:_./=+-@
@@ -1776,6 +1784,8 @@ tests:
17761784
platform: AWS
17771785
platformStatus:
17781786
aws:
1787+
cloudLoadBalancerConfig:
1788+
dnsType: PlatformDefault
17791789
region: us-east-1
17801790
resourceTags:
17811791
- key: key:_./=+-@

‎config/v1/tests/infrastructures.config.openshift.io/AWSClusterHostedDNS.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "Infrastructure"
33
crdName: infrastructures.config.openshift.io
44
featureGates:
55
- AWSClusterHostedDNSInstall
6+
- AWSDualStackInstall
67
tests:
78
onCreate:
89
- name: Should be able to create a minimal Infrastructure
@@ -28,7 +29,10 @@ tests:
2829
infrastructureTopology: HighlyAvailable
2930
platform: AWS
3031
platformStatus:
31-
aws: {}
32+
aws:
33+
cloudLoadBalancerConfig:
34+
dnsType: PlatformDefault
35+
ipFamily: IPv4
3236
type: AWS
3337
updated: |
3438
apiVersion: config.openshift.io/v1
@@ -42,7 +46,10 @@ tests:
4246
infrastructureTopology: HighlyAvailable
4347
platform: AWS
4448
platformStatus:
45-
aws: {}
49+
aws:
50+
cloudLoadBalancerConfig:
51+
dnsType: PlatformDefault
52+
ipFamily: IPv4
4653
type: AWS
4754
expected: |
4855
apiVersion: config.openshift.io/v1

‎config/v1/tests/infrastructures.config.openshift.io/AWSClusterHostedDNSInstall.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: "Infrastructure"
33
crdName: infrastructures.config.openshift.io
44
featureGates:
55
- AWSClusterHostedDNSInstall
6+
- AWSDualStackInstall
67
tests:
78
onCreate:
89
- name: Should be able to create a minimal Infrastructure
@@ -28,7 +29,10 @@ tests:
2829
infrastructureTopology: HighlyAvailable
2930
platform: AWS
3031
platformStatus:
31-
aws: {}
32+
aws:
33+
cloudLoadBalancerConfig:
34+
dnsType: PlatformDefault
35+
ipFamily: IPv4
3236
type: AWS
3337
updated: |
3438
apiVersion: config.openshift.io/v1
@@ -42,7 +46,10 @@ tests:
4246
infrastructureTopology: HighlyAvailable
4347
platform: AWS
4448
platformStatus:
45-
aws: {}
49+
aws:
50+
cloudLoadBalancerConfig:
51+
dnsType: PlatformDefault
52+
ipFamily: IPv4
4653
type: AWS
4754
expected: |
4855
apiVersion: config.openshift.io/v1

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_infrastructures-Default.crd.yaml‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,6 +1171,110 @@ spec:
11711171
description: aws contains settings specific to the Amazon Web
11721172
Services infrastructure provider.
11731173
properties:
1174+
cloudLoadBalancerConfig:
1175+
default:
1176+
dnsType: PlatformDefault
1177+
description: |-
1178+
cloudLoadBalancerConfig holds configuration related to DNS and cloud
1179+
load balancers. It allows configuration of in-cluster DNS as an alternative
1180+
to the platform default DNS implementation.
1181+
When using the ClusterHosted DNS type, Load Balancer IP addresses
1182+
must be provided for the API and internal API load balancers as well as the
1183+
ingress load balancer.
1184+
nullable: true
1185+
properties:
1186+
clusterHosted:
1187+
description: |-
1188+
clusterHosted holds the IP addresses of API, API-Int and Ingress Load
1189+
Balancers on Cloud Platforms. The DNS solution hosted within the cluster
1190+
use these IP addresses to provide resolution for API, API-Int and Ingress
1191+
services.
1192+
properties:
1193+
apiIntLoadBalancerIPs:
1194+
description: |-
1195+
apiIntLoadBalancerIPs holds Load Balancer IPs for the internal API service.
1196+
These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses.
1197+
Entries in the apiIntLoadBalancerIPs must be unique.
1198+
A maximum of 16 IP addresses are permitted.
1199+
format: ip
1200+
items:
1201+
description: IP is an IP address (for example, "10.0.0.0"
1202+
or "fd00::").
1203+
maxLength: 39
1204+
minLength: 1
1205+
type: string
1206+
x-kubernetes-validations:
1207+
- message: value must be a valid IP address
1208+
rule: isIP(self)
1209+
maxItems: 16
1210+
type: array
1211+
x-kubernetes-list-type: set
1212+
apiLoadBalancerIPs:
1213+
description: |-
1214+
apiLoadBalancerIPs holds Load Balancer IPs for the API service.
1215+
These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses.
1216+
Could be empty for private clusters.
1217+
Entries in the apiLoadBalancerIPs must be unique.
1218+
A maximum of 16 IP addresses are permitted.
1219+
format: ip
1220+
items:
1221+
description: IP is an IP address (for example, "10.0.0.0"
1222+
or "fd00::").
1223+
maxLength: 39
1224+
minLength: 1
1225+
type: string
1226+
x-kubernetes-validations:
1227+
- message: value must be a valid IP address
1228+
rule: isIP(self)
1229+
maxItems: 16
1230+
type: array
1231+
x-kubernetes-list-type: set
1232+
ingressLoadBalancerIPs:
1233+
description: |-
1234+
ingressLoadBalancerIPs holds IPs for Ingress Load Balancers.
1235+
These Load Balancer IP addresses can be IPv4 and/or IPv6 addresses.
1236+
Entries in the ingressLoadBalancerIPs must be unique.
1237+
A maximum of 16 IP addresses are permitted.
1238+
format: ip
1239+
items:
1240+
description: IP is an IP address (for example, "10.0.0.0"
1241+
or "fd00::").
1242+
maxLength: 39
1243+
minLength: 1
1244+
type: string
1245+
x-kubernetes-validations:
1246+
- message: value must be a valid IP address
1247+
rule: isIP(self)
1248+
maxItems: 16
1249+
type: array
1250+
x-kubernetes-list-type: set
1251+
type: object
1252+
dnsType:
1253+
default: PlatformDefault
1254+
description: |-
1255+
dnsType indicates the type of DNS solution in use within the cluster. Its default value of
1256+
`PlatformDefault` indicates that the cluster's DNS is the default provided by the cloud platform.
1257+
It can be set to `ClusterHosted` to bypass the configuration of the cloud default DNS. In this mode,
1258+
the cluster needs to provide a self-hosted DNS solution for the cluster's installation to succeed.
1259+
The cluster's use of the cloud's Load Balancers is unaffected by this setting.
1260+
The value is immutable after it has been set at install time.
1261+
Currently, there is no way for the customer to add additional DNS entries into the cluster hosted DNS.
1262+
Enabling this functionality allows the user to start their own DNS solution outside the cluster after
1263+
installation is complete. The customer would be responsible for configuring this custom DNS solution,
1264+
and it can be run in addition to the in-cluster DNS solution.
1265+
enum:
1266+
- ClusterHosted
1267+
- PlatformDefault
1268+
type: string
1269+
x-kubernetes-validations:
1270+
- message: dnsType is immutable
1271+
rule: oldSelf == '' || self == oldSelf
1272+
type: object
1273+
x-kubernetes-validations:
1274+
- message: clusterHosted is permitted only when dnsType is
1275+
ClusterHosted
1276+
rule: 'has(self.dnsType) && self.dnsType != ''ClusterHosted''
1277+
? !has(self.clusterHosted) : true'
11741278
region:
11751279
description: region holds the default AWS region for new AWS
11761280
resources created by the cluster.

‎features.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
| NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
2121
| NewOLMWebhookProviderOpenshiftServiceCA| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
2222
| AWSClusterHostedDNS| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
23-
| AWSClusterHostedDNSInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
2423
| AWSDedicatedHosts| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
2524
| AWSDualStackInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
2625
| AWSServiceLBNetworkSecurityGroup| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
@@ -74,6 +73,7 @@
7473
| VSphereHostVMGroupZonal| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7574
| VSphereMixedNodeEnv| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7675
| VolumeGroupSnapshot| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
76+
| AWSClusterHostedDNSInstall| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7777
| AdditionalRoutingCapabilities| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7878
| AdminNetworkPolicy| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
7979
| AlibabaPlatform| <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |

‎features/features.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ var (
827827
contactPerson("barbacbd").
828828
productScope(ocpSpecific).
829829
enhancementPR("https://github.com/openshift/enhancements/pull/1468").
830-
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
830+
enableIn(configv1.Default, configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
831831
mustRegister()
832832

833833
FeatureGateGCPCustomAPIEndpointsInstall = newFeatureGate("GCPCustomAPIEndpointsInstall").

0 commit comments

Comments
 (0)