Skip to content

Commit 13a84de

Browse files
Merge pull request #2991 from patrickdillon/promote-gcd
CORS-4550: Promote GCD to Default
2 parents c804ea6 + 370198a commit 13a84de

14 files changed

Lines changed: 190 additions & 14 deletions

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,28 @@ spec:
19531953
- message: resourceTags are immutable and may only be configured
19541954
during installation
19551955
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
1956+
universeDomain:
1957+
description: |-
1958+
universeDomain is the GCP universe domain for the cluster, detected from
1959+
the installer credentials. Components with their own GCP credentials should
1960+
read the universe domain from those credentials, as they are the authoritative
1961+
source. This field is provided for components that do not have GCP credentials
1962+
and for general observability.
1963+
1964+
When omitted, standard public GCP (googleapis.com) is assumed.
1965+
1966+
universeDomain is an optional field that, when specified, must be non-empty and at most
1967+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
1968+
characters, '-' or '.', and starting and ending with an alphanumeric character.
1969+
maxLength: 253
1970+
minLength: 1
1971+
type: string
1972+
x-kubernetes-validations:
1973+
- message: 'universeDomain must be a valid DNS subdomain:
1974+
contain no more than 253 characters, contain only lowercase
1975+
alphanumeric characters, ''-'' or ''.'', and start and
1976+
end with an alphanumeric character'
1977+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
19561978
type: object
19571979
x-kubernetes-validations:
19581980
- message: resourceLabels may only be configured during installation

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,28 @@ spec:
19531953
- message: resourceTags are immutable and may only be configured
19541954
during installation
19551955
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
1956+
universeDomain:
1957+
description: |-
1958+
universeDomain is the GCP universe domain for the cluster, detected from
1959+
the installer credentials. Components with their own GCP credentials should
1960+
read the universe domain from those credentials, as they are the authoritative
1961+
source. This field is provided for components that do not have GCP credentials
1962+
and for general observability.
1963+
1964+
When omitted, standard public GCP (googleapis.com) is assumed.
1965+
1966+
universeDomain is an optional field that, when specified, must be non-empty and at most
1967+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
1968+
characters, '-' or '.', and starting and ending with an alphanumeric character.
1969+
maxLength: 253
1970+
minLength: 1
1971+
type: string
1972+
x-kubernetes-validations:
1973+
- message: 'universeDomain must be a valid DNS subdomain:
1974+
contain no more than 253 characters, contain only lowercase
1975+
alphanumeric characters, ''-'' or ''.'', and start and
1976+
end with an alphanumeric character'
1977+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
19561978
type: object
19571979
x-kubernetes-validations:
19581980
- message: resourceLabels may only be configured during installation

‎features.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
| GCPCustomAPIEndpoints| | | <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> |
6060
| GCPCustomAPIEndpointsInstall| | | <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> |
6161
| GCPDualStackInstall| | | <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> |
62-
| GCPSovereignCloudInstall| | | <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> |
6362
| GatewayAPIManagementMode| | | <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> |
6463
| GomaxprocsInjection| | | <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> |
6564
| HyperShiftOnlyDynamicResourceAllocation| <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> | |
@@ -102,6 +101,7 @@
102101
| ExternalOIDC| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
103102
| ExternalOIDCWithUIDAndExtraClaimMappings| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
104103
| ExternalOIDCWithUpstreamParity| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
104+
| GCPSovereignCloudInstall| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
105105
| GatewayAPIWithoutOLM| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
106106
| ImageStreamImportMode| <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> | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
107107
| IngressControllerDynamicConfigurationManager| <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> | <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
@@ -853,7 +853,7 @@ var (
853853
contactPerson("barbacbd").
854854
productScope(ocpSpecific).
855855
enhancementPR("https://github.com/openshift/enhancements/pull/1977").
856-
enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
856+
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
857857
mustRegister()
858858

859859
FeatureCBORServingAndStorage = newFeatureGate("CBORServingAndStorage").

‎machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,28 @@ spec:
22512251
be configured during installation
22522252
rule: self.all(x, x in oldSelf) && oldSelf.all(x,
22532253
x in self)
2254+
universeDomain:
2255+
description: |-
2256+
universeDomain is the GCP universe domain for the cluster, detected from
2257+
the installer credentials. Components with their own GCP credentials should
2258+
read the universe domain from those credentials, as they are the authoritative
2259+
source. This field is provided for components that do not have GCP credentials
2260+
and for general observability.
2261+
2262+
When omitted, standard public GCP (googleapis.com) is assumed.
2263+
2264+
universeDomain is an optional field that, when specified, must be non-empty and at most
2265+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2266+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2267+
maxLength: 253
2268+
minLength: 1
2269+
type: string
2270+
x-kubernetes-validations:
2271+
- message: 'universeDomain must be a valid DNS subdomain:
2272+
contain no more than 253 characters, contain only
2273+
lowercase alphanumeric characters, ''-'' or ''.'',
2274+
and start and end with an alphanumeric character'
2275+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
22542276
type: object
22552277
x-kubernetes-validations:
22562278
- message: resourceLabels may only be configured during

‎machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-OKD.crd.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,28 @@ spec:
22512251
be configured during installation
22522252
rule: self.all(x, x in oldSelf) && oldSelf.all(x,
22532253
x in self)
2254+
universeDomain:
2255+
description: |-
2256+
universeDomain is the GCP universe domain for the cluster, detected from
2257+
the installer credentials. Components with their own GCP credentials should
2258+
read the universe domain from those credentials, as they are the authoritative
2259+
source. This field is provided for components that do not have GCP credentials
2260+
and for general observability.
2261+
2262+
When omitted, standard public GCP (googleapis.com) is assumed.
2263+
2264+
universeDomain is an optional field that, when specified, must be non-empty and at most
2265+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2266+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2267+
maxLength: 253
2268+
minLength: 1
2269+
type: string
2270+
x-kubernetes-validations:
2271+
- message: 'universeDomain must be a valid DNS subdomain:
2272+
contain no more than 253 characters, contain only
2273+
lowercase alphanumeric characters, ''-'' or ''.'',
2274+
and start and end with an alphanumeric character'
2275+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
22542276
type: object
22552277
x-kubernetes-validations:
22562278
- message: resourceLabels may only be configured during

‎payload-manifests/crds/0000_10_config-operator_01_infrastructures-Default.crd.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,28 @@ spec:
19531953
- message: resourceTags are immutable and may only be configured
19541954
during installation
19551955
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
1956+
universeDomain:
1957+
description: |-
1958+
universeDomain is the GCP universe domain for the cluster, detected from
1959+
the installer credentials. Components with their own GCP credentials should
1960+
read the universe domain from those credentials, as they are the authoritative
1961+
source. This field is provided for components that do not have GCP credentials
1962+
and for general observability.
1963+
1964+
When omitted, standard public GCP (googleapis.com) is assumed.
1965+
1966+
universeDomain is an optional field that, when specified, must be non-empty and at most
1967+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
1968+
characters, '-' or '.', and starting and ending with an alphanumeric character.
1969+
maxLength: 253
1970+
minLength: 1
1971+
type: string
1972+
x-kubernetes-validations:
1973+
- message: 'universeDomain must be a valid DNS subdomain:
1974+
contain no more than 253 characters, contain only lowercase
1975+
alphanumeric characters, ''-'' or ''.'', and start and
1976+
end with an alphanumeric character'
1977+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
19561978
type: object
19571979
x-kubernetes-validations:
19581980
- message: resourceLabels may only be configured during installation

‎payload-manifests/crds/0000_10_config-operator_01_infrastructures-OKD.crd.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,28 @@ spec:
19531953
- message: resourceTags are immutable and may only be configured
19541954
during installation
19551955
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
1956+
universeDomain:
1957+
description: |-
1958+
universeDomain is the GCP universe domain for the cluster, detected from
1959+
the installer credentials. Components with their own GCP credentials should
1960+
read the universe domain from those credentials, as they are the authoritative
1961+
source. This field is provided for components that do not have GCP credentials
1962+
and for general observability.
1963+
1964+
When omitted, standard public GCP (googleapis.com) is assumed.
1965+
1966+
universeDomain is an optional field that, when specified, must be non-empty and at most
1967+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
1968+
characters, '-' or '.', and starting and ending with an alphanumeric character.
1969+
maxLength: 253
1970+
minLength: 1
1971+
type: string
1972+
x-kubernetes-validations:
1973+
- message: 'universeDomain must be a valid DNS subdomain:
1974+
contain no more than 253 characters, contain only lowercase
1975+
alphanumeric characters, ''-'' or ''.'', and start and
1976+
end with an alphanumeric character'
1977+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
19561978
type: object
19571979
x-kubernetes-validations:
19581980
- message: resourceLabels may only be configured during installation

‎payload-manifests/crds/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,28 @@ spec:
22512251
be configured during installation
22522252
rule: self.all(x, x in oldSelf) && oldSelf.all(x,
22532253
x in self)
2254+
universeDomain:
2255+
description: |-
2256+
universeDomain is the GCP universe domain for the cluster, detected from
2257+
the installer credentials. Components with their own GCP credentials should
2258+
read the universe domain from those credentials, as they are the authoritative
2259+
source. This field is provided for components that do not have GCP credentials
2260+
and for general observability.
2261+
2262+
When omitted, standard public GCP (googleapis.com) is assumed.
2263+
2264+
universeDomain is an optional field that, when specified, must be non-empty and at most
2265+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2266+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2267+
maxLength: 253
2268+
minLength: 1
2269+
type: string
2270+
x-kubernetes-validations:
2271+
- message: 'universeDomain must be a valid DNS subdomain:
2272+
contain no more than 253 characters, contain only
2273+
lowercase alphanumeric characters, ''-'' or ''.'',
2274+
and start and end with an alphanumeric character'
2275+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
22542276
type: object
22552277
x-kubernetes-validations:
22562278
- message: resourceLabels may only be configured during

0 commit comments

Comments
 (0)