Skip to content

Commit 58dfa6d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2457 from petr-muller/ota-923-promote-FeatureGateCVOConfiguration-TechPreview
OTA-923: Promote `ClusterVersionOperatorConfiguration` to TechPreview
2 parents 2d04128 + 26ea290 commit 58dfa6d

File tree

5 files changed

+98
-8
lines changed

5 files changed

+98
-8
lines changed

‎features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
| ShortCertRotation| | | | | | |
88
| NoRegistryClusterOperations| | | | <span style="background-color: #519450">Enabled</span> | | |
99
| BootImageSkewEnforcement| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
10-
| ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
1110
| Example2| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
1211
| ExternalSnapshotMetadata| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
1312
| NewOLMCatalogdAPIV1Metas| | | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
@@ -27,6 +26,7 @@
2726
| BootcNodeManagement| | | <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> |
2827
| ClusterAPIInstallIBMCloud| | | <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> |
2928
| ClusterMonitoringConfig| | | <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> |
29+
| ClusterVersionOperatorConfiguration| | | <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> |
3030
| DNSNameResolver| | | <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> |
3131
| DualReplica| | | <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> |
3232
| DyanmicServiceEndpointIBMCloud| | | <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
@@ -682,7 +682,7 @@ var (
682682
contactPerson("dhurta").
683683
productScope(ocpSpecific).
684684
enhancementPR("https://github.com/openshift/enhancements/pull/1492").
685-
enableIn(configv1.DevPreviewNoUpgrade).
685+
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
686686
mustRegister()
687687

688688
FeatureGateGCPCustomAPIEndpoints = newFeatureGate("GCPCustomAPIEndpoints").

‎operator/v1alpha1/zz_generated.crd-manifests/0000_00_cluster-version-operator_01_clusterversionoperators-TechPreviewNoUpgrade.crd.yaml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
api-approved.openshift.io: https://github.com/openshift/api/pull/2044
6+
api.openshift.io/merged-by-featuregates: "true"
7+
include.release.openshift.io/ibm-cloud-managed: "true"
8+
include.release.openshift.io/self-managed-high-availability: "true"
9+
release.openshift.io/feature-set: TechPreviewNoUpgrade
10+
name: clusterversionoperators.operator.openshift.io
11+
spec:
12+
group: operator.openshift.io
13+
names:
14+
kind: ClusterVersionOperator
15+
listKind: ClusterVersionOperatorList
16+
plural: clusterversionoperators
17+
singular: clusterversionoperator
18+
scope: Cluster
19+
versions:
20+
- name: v1alpha1
21+
schema:
22+
openAPIV3Schema:
23+
description: |-
24+
ClusterVersionOperator holds cluster-wide information about the Cluster Version Operator.
25+
26+
Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.
27+
properties:
28+
apiVersion:
29+
description: |-
30+
APIVersion defines the versioned schema of this representation of an object.
31+
Servers should convert recognized schemas to the latest internal value, and
32+
may reject unrecognized values.
33+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
34+
type: string
35+
kind:
36+
description: |-
37+
Kind is a string value representing the REST resource this object represents.
38+
Servers may infer this from the endpoint the client submits requests to.
39+
Cannot be updated.
40+
In CamelCase.
41+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
42+
type: string
43+
metadata:
44+
type: object
45+
spec:
46+
description: spec is the specification of the desired behavior of the
47+
Cluster Version Operator.
48+
properties:
49+
operatorLogLevel:
50+
default: Normal
51+
description: |-
52+
operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a
53+
simple way to manage coarse grained logging choices that operators have to interpret for themselves.
54+
55+
Valid values are: "Normal", "Debug", "Trace", "TraceAll".
56+
Defaults to "Normal".
57+
enum:
58+
- ""
59+
- Normal
60+
- Debug
61+
- Trace
62+
- TraceAll
63+
type: string
64+
type: object
65+
status:
66+
description: status is the most recently observed status of the Cluster
67+
Version Operator.
68+
properties:
69+
observedGeneration:
70+
description: |-
71+
observedGeneration represents the most recent generation observed by the operator and specifies the version of
72+
the spec field currently being synced.
73+
format: int64
74+
type: integer
75+
x-kubernetes-validations:
76+
- message: observedGeneration must only increase
77+
rule: self >= oldSelf
78+
type: object
79+
required:
80+
- metadata
81+
- spec
82+
type: object
83+
x-kubernetes-validations:
84+
- message: ClusterVersionOperator is a singleton; the .metadata.name field
85+
must be 'cluster'
86+
rule: self.metadata.name == 'cluster'
87+
served: true
88+
storage: true
89+
subresources:
90+
status: {}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
{
2222
"name": "ClusterAPIInstall"
2323
},
24-
{
25-
"name": "ClusterVersionOperatorConfiguration"
26-
},
2724
{
2825
"name": "EventedPLEG"
2926
},
@@ -116,6 +113,9 @@
116113
{
117114
"name": "ClusterMonitoringConfig"
118115
},
116+
{
117+
"name": "ClusterVersionOperatorConfiguration"
118+
},
119119
{
120120
"name": "ConsolePluginContentSecurityPolicy"
121121
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
{
2222
"name": "ClusterAPIInstall"
2323
},
24-
{
25-
"name": "ClusterVersionOperatorConfiguration"
26-
},
2724
{
2825
"name": "EventedPLEG"
2926
},
@@ -101,6 +98,9 @@
10198
{
10299
"name": "ClusterMonitoringConfig"
103100
},
101+
{
102+
"name": "ClusterVersionOperatorConfiguration"
103+
},
104104
{
105105
"name": "ConsolePluginContentSecurityPolicy"
106106
},

0 commit comments

Comments
 (0)