Skip to content

Commit ef08cf6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2155 from JoelSpeed/monitoring-alpha1
Monitoring Config should start life as v1alpha1
2 parents 366ffb8 + c51a459 commit ef08cf6

21 files changed

+454
-453
lines changed

‎config/v1/register.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
7272
&ImageDigestMirrorSetList{},
7373
&ImageTagMirrorSet{},
7474
&ImageTagMirrorSetList{},
75-
&ClusterMonitoring{},
76-
&ClusterMonitoringList{},
7775
)
7876
metav1.AddToGroupVersion(scheme, GroupVersion)
7977
return nil

‎config/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/v1/zz_generated.featuregated-crd-manifests.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,6 @@ builds.config.openshift.io:
6464
TopLevelFeatureGates: []
6565
Version: v1
6666

67-
clustermonitoring.config.openshift.io:
68-
Annotations:
69-
description: Cluster Monitoring Operators configuration API
70-
ApprovedPRNumber: https://github.com/openshift/api/pull/1929
71-
CRDName: clustermonitoring.config.openshift.io
72-
Capability: ""
73-
Category: ""
74-
FeatureGates:
75-
- ClusterMonitoringConfig
76-
FilenameOperatorName: config-operator
77-
FilenameOperatorOrdering: "01"
78-
FilenameRunLevel: "0000_10"
79-
GroupName: config.openshift.io
80-
HasStatus: true
81-
KindName: ClusterMonitoring
82-
Labels: {}
83-
PluralName: clustermonitoring
84-
PrinterColumns: []
85-
Scope: Cluster
86-
ShortNames: null
87-
TopLevelFeatureGates:
88-
- ClusterMonitoringConfig
89-
Version: v1
90-
9167
clusteroperators.config.openshift.io:
9268
Annotations:
9369
include.release.openshift.io/self-managed-high-availability: "true"

‎config/v1/zz_generated.swagger_doc_generated.go

Lines changed: 0 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/v1alpha1/register.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ func Resource(resource string) schema.GroupResource {
3030
// Adds the list of known types to api.Scheme.
3131
func addKnownTypes(scheme *runtime.Scheme) error {
3232
scheme.AddKnownTypes(GroupVersion,
33+
&ClusterMonitoring{},
34+
&ClusterMonitoringList{},
3335
&InsightsDataGather{},
3436
&InsightsDataGatherList{},
3537
&Backup{},

‎config/v1/tests/clustermonitoring.config.openshift.io/AAA_ungated.yaml renamed to ‎config/v1alpha1/tests/clustermonitoring.config.openshift.io/AAA_ungated.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ tests:
55
onCreate:
66
- name: Should be able to create a minimal ClusterMonitoring
77
initial: |
8-
apiVersion: config.openshift.io/v1
8+
apiVersion: config.openshift.io/v1alpha1
99
kind: ClusterMonitoring
1010
spec:
1111
userDefined:
1212
mode: "Disabled"
1313
1414
expected: |
15-
apiVersion: config.openshift.io/v1
15+
apiVersion: config.openshift.io/v1alpha1
1616
kind: ClusterMonitoring
1717
spec:
1818
userDefined:

‎config/v1/tests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml renamed to ‎config/v1alpha1/tests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ tests:
66
onCreate:
77
- name: Should be able to create a minimal ClusterMonitoring
88
initial: |
9-
apiVersion: config.openshift.io/v1
9+
apiVersion: config.openshift.io/v1alpha1
1010
kind: ClusterMonitoring
1111
spec:
1212
userDefined:
1313
mode: "Disabled"
1414
1515
expected: |
16-
apiVersion: config.openshift.io/v1
16+
apiVersion: config.openshift.io/v1alpha1
1717
kind: ClusterMonitoring
1818
spec:
1919
userDefined:

‎config/v1/types_cluster_monitoring.go renamed to ‎config/v1alpha1/types_cluster_monitoring.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v1
17+
package v1alpha1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml renamed to ‎config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
singular: clustermonitoring
1919
scope: Cluster
2020
versions:
21-
- name: v1
21+
- name: v1alpha1
2222
schema:
2323
openAPIV3Schema:
2424
description: |-

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml renamed to ‎config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
singular: clustermonitoring
1919
scope: Cluster
2020
versions:
21-
- name: v1
21+
- name: v1alpha1
2222
schema:
2323
openAPIV3Schema:
2424
description: |-

‎config/v1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-TechPreviewNoUpgrade.crd.yaml renamed to ‎config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-TechPreviewNoUpgrade.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
singular: clustermonitoring
1919
scope: Cluster
2020
versions:
21-
- name: v1
21+
- name: v1alpha1
2222
schema:
2323
openAPIV3Schema:
2424
description: |-

0 commit comments

Comments
 (0)