Skip to content

Commit dc075d6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2970 from patrickdillon/gcd-techpreview
Move GCD to TechPreview
2 parents 8f52beb + a073271 commit dc075d6

8 files changed

Lines changed: 96 additions & 8 deletions

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,28 @@ spec:
20662066
- message: resourceTags are immutable and may only be configured
20672067
during installation
20682068
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
2069+
universeDomain:
2070+
description: |-
2071+
universeDomain is the GCP universe domain for the cluster, detected from
2072+
the installer credentials. Components with their own GCP credentials should
2073+
read the universe domain from those credentials, as they are the authoritative
2074+
source. This field is provided for components that do not have GCP credentials
2075+
and for general observability.
2076+
2077+
When omitted, standard public GCP (googleapis.com) is assumed.
2078+
2079+
universeDomain is an optional field that, when specified, must be non-empty and at most
2080+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2081+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2082+
maxLength: 253
2083+
minLength: 1
2084+
type: string
2085+
x-kubernetes-validations:
2086+
- message: 'universeDomain must be a valid DNS subdomain:
2087+
contain no more than 253 characters, contain only lowercase
2088+
alphanumeric characters, ''-'' or ''.'', and start and
2089+
end with an alphanumeric character'
2090+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
20692091
type: object
20702092
x-kubernetes-validations:
20712093
- message: resourceLabels may only be configured during installation

‎features.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
| ClusterUpdatePreflight| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
2020
| ConfidentialCluster| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
2121
| Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
22-
| GCPSovereignCloudInstall| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
2322
| MachineAPIMigrationVSphere| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
2423
| NetworkConnect| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | | |
2524
| NewOLMBoxCutterRuntime| | | | <span style="background-color: #519450">Enabled</span> | | | | <span style="background-color: #519450">Enabled</span> |
@@ -62,6 +61,7 @@
6261
| 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> |
6362
| 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> |
6463
| 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> |
64+
| 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> |
6565
| 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> |
6666
| 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> | |
6767
| ImageModeStatusReporting| | | <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
@@ -877,7 +877,7 @@ var (
877877
contactPerson("barbacbd").
878878
productScope(ocpSpecific).
879879
enhancementPR("https://github.com/openshift/enhancements/pull/1977").
880-
enable(inDevPreviewNoUpgrade()).
880+
enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
881881
mustRegister()
882882

883883
FeatureCBORServingAndStorage = newFeatureGate("CBORServingAndStorage").

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,6 +2368,28 @@ spec:
23682368
be configured during installation
23692369
rule: self.all(x, x in oldSelf) && oldSelf.all(x,
23702370
x in self)
2371+
universeDomain:
2372+
description: |-
2373+
universeDomain is the GCP universe domain for the cluster, detected from
2374+
the installer credentials. Components with their own GCP credentials should
2375+
read the universe domain from those credentials, as they are the authoritative
2376+
source. This field is provided for components that do not have GCP credentials
2377+
and for general observability.
2378+
2379+
When omitted, standard public GCP (googleapis.com) is assumed.
2380+
2381+
universeDomain is an optional field that, when specified, must be non-empty and at most
2382+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2383+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2384+
maxLength: 253
2385+
minLength: 1
2386+
type: string
2387+
x-kubernetes-validations:
2388+
- message: 'universeDomain must be a valid DNS subdomain:
2389+
contain no more than 253 characters, contain only
2390+
lowercase alphanumeric characters, ''-'' or ''.'',
2391+
and start and end with an alphanumeric character'
2392+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
23712393
type: object
23722394
x-kubernetes-validations:
23732395
- message: resourceLabels may only be configured during

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,28 @@ spec:
20662066
- message: resourceTags are immutable and may only be configured
20672067
during installation
20682068
rule: self.all(x, x in oldSelf) && oldSelf.all(x, x in self)
2069+
universeDomain:
2070+
description: |-
2071+
universeDomain is the GCP universe domain for the cluster, detected from
2072+
the installer credentials. Components with their own GCP credentials should
2073+
read the universe domain from those credentials, as they are the authoritative
2074+
source. This field is provided for components that do not have GCP credentials
2075+
and for general observability.
2076+
2077+
When omitted, standard public GCP (googleapis.com) is assumed.
2078+
2079+
universeDomain is an optional field that, when specified, must be non-empty and at most
2080+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2081+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2082+
maxLength: 253
2083+
minLength: 1
2084+
type: string
2085+
x-kubernetes-validations:
2086+
- message: 'universeDomain must be a valid DNS subdomain:
2087+
contain no more than 253 characters, contain only lowercase
2088+
alphanumeric characters, ''-'' or ''.'', and start and
2089+
end with an alphanumeric character'
2090+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
20692091
type: object
20702092
x-kubernetes-validations:
20712093
- message: resourceLabels may only be configured during installation

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,6 +2368,28 @@ spec:
23682368
be configured during installation
23692369
rule: self.all(x, x in oldSelf) && oldSelf.all(x,
23702370
x in self)
2371+
universeDomain:
2372+
description: |-
2373+
universeDomain is the GCP universe domain for the cluster, detected from
2374+
the installer credentials. Components with their own GCP credentials should
2375+
read the universe domain from those credentials, as they are the authoritative
2376+
source. This field is provided for components that do not have GCP credentials
2377+
and for general observability.
2378+
2379+
When omitted, standard public GCP (googleapis.com) is assumed.
2380+
2381+
universeDomain is an optional field that, when specified, must be non-empty and at most
2382+
253 characters. It must be a valid DNS subdomain: containing only lowercase alphanumeric
2383+
characters, '-' or '.', and starting and ending with an alphanumeric character.
2384+
maxLength: 253
2385+
minLength: 1
2386+
type: string
2387+
x-kubernetes-validations:
2388+
- message: 'universeDomain must be a valid DNS subdomain:
2389+
contain no more than 253 characters, contain only
2390+
lowercase alphanumeric characters, ''-'' or ''.'',
2391+
and start and end with an alphanumeric character'
2392+
rule: '!format.dns1123Subdomain().validate(self).hasValue()'
23712393
type: object
23722394
x-kubernetes-validations:
23732395
- message: resourceLabels may only be configured during

‎payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@
4949
{
5050
"name": "Example2"
5151
},
52-
{
53-
"name": "GCPSovereignCloudInstall"
54-
},
5552
{
5653
"name": "KarpenterOperator"
5754
},
@@ -252,6 +249,9 @@
252249
{
253250
"name": "GCPDualStackInstall"
254251
},
252+
{
253+
"name": "GCPSovereignCloudInstall"
254+
},
255255
{
256256
"name": "GatewayAPIManagementMode"
257257
},

‎payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-TechPreviewNoUpgrade.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@
4343
{
4444
"name": "Example2"
4545
},
46-
{
47-
"name": "GCPSovereignCloudInstall"
48-
},
4946
{
5047
"name": "HyperShiftOnlyDynamicResourceAllocation"
5148
},
@@ -231,6 +228,9 @@
231228
{
232229
"name": "GCPDualStackInstall"
233230
},
231+
{
232+
"name": "GCPSovereignCloudInstall"
233+
},
234234
{
235235
"name": "GatewayAPIManagementMode"
236236
},

0 commit comments

Comments
 (0)