Merge pull request #2588 from danielmellado/fix-clustermonitoring-plural

OCPBUGS-65819: fix ClusterMonitoring CRD plural name

Author: openshift-merge-bot[bot]

…ing.config.openshift.io/AAA_ungated.yaml …ngs.config.openshift.io/AAA_ungated.yamlconfig/v1alpha1/tests/clustermonitoring.config.openshift.io/AAA_ungated.yaml renamed to config/v1alpha1/tests/clustermonitorings.config.openshift.io/AAA_ungated.yaml config/v1alpha1/tests/clustermonitoring.config.openshift.io/AAA_ungated.yaml renamed to config/v1alpha1/tests/clustermonitorings.config.openshift.io/AAA_ungated.yaml

@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "ClusterMonitoring"
-crdName: clustermonitoring.config.openshift.io
+crdName: clustermonitorings.config.openshift.io
 tests:
   onCreate:
     - name: Should be able to create a minimal ClusterMonitoring

…penshift.io/ClusterMonitoringConfig.yaml …penshift.io/ClusterMonitoringConfig.yamlconfig/v1alpha1/tests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml renamed to config/v1alpha1/tests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml config/v1alpha1/tests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml renamed to config/v1alpha1/tests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml

@@ -1,6 +1,6 @@
 apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
 name: "ClusterMonitoring"
-crdName: clustermonitoring.config.openshift.io
+crdName: clustermonitorings.config.openshift.io
 featureGate: ClusterMonitoringConfig
 tests:
   onCreate:

config/v1alpha1/types_cluster_monitoring.go

@@ -33,7 +33,7 @@ import (
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/1929
 // +openshift:file-pattern=cvoRunLevel=0000_10,operatorName=config-operator,operatorOrdering=01
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=clustermonitoring,scope=Cluster
+// +kubebuilder:resource:path=clustermonitorings,scope=Cluster
 // +kubebuilder:subresource:status
 // +kubebuilder:metadata:annotations="description=Cluster Monitoring Operators configuration API"
 // +openshift:enable:FeatureGate=ClusterMonitoringConfig

…ustermonitoring-CustomNoUpgrade.crd.yaml …stermonitorings-CustomNoUpgrade.crd.yamlpayload-manifests/crds/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml renamed to config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings-CustomNoUpgrade.crd.yaml payload-manifests/crds/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml renamed to config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings-CustomNoUpgrade.crd.yaml

@@ -8,13 +8,13 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: CustomNoUpgrade
-  name: clustermonitoring.config.openshift.io
+  name: clustermonitorings.config.openshift.io
 spec:
   group: config.openshift.io
   names:
     kind: ClusterMonitoring
     listKind: ClusterMonitoringList
-    plural: clustermonitoring
+    plural: clustermonitorings
     singular: clustermonitoring
   scope: Cluster
   versions:

…rmonitoring-DevPreviewNoUpgrade.crd.yaml …monitorings-DevPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml renamed to config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings-DevPreviewNoUpgrade.crd.yaml payload-manifests/crds/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml renamed to config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings-DevPreviewNoUpgrade.crd.yaml

@@ -8,13 +8,13 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: DevPreviewNoUpgrade
-  name: clustermonitoring.config.openshift.io
+  name: clustermonitorings.config.openshift.io
 spec:
   group: config.openshift.io
   names:
     kind: ClusterMonitoring
     listKind: ClusterMonitoringList
-    plural: clustermonitoring
+    plural: clustermonitorings
     singular: clustermonitoring
   scope: Cluster
   versions:

…monitoring-TechPreviewNoUpgrade.crd.yaml …onitorings-TechPreviewNoUpgrade.crd.yamlpayload-manifests/crds/0000_10_config-operator_01_clustermonitoring-TechPreviewNoUpgrade.crd.yaml renamed to config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings-TechPreviewNoUpgrade.crd.yaml payload-manifests/crds/0000_10_config-operator_01_clustermonitoring-TechPreviewNoUpgrade.crd.yaml renamed to config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitorings-TechPreviewNoUpgrade.crd.yaml

@@ -8,13 +8,13 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: TechPreviewNoUpgrade
-  name: clustermonitoring.config.openshift.io
+  name: clustermonitorings.config.openshift.io
 spec:
   group: config.openshift.io
   names:
     kind: ClusterMonitoring
     listKind: ClusterMonitoringList
-    plural: clustermonitoring
+    plural: clustermonitorings
     singular: clustermonitoring
   scope: Cluster
   versions:

config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml

@@ -45,11 +45,11 @@ clusterimagepolicies.config.openshift.io:
   - SigstoreImageVerification
   Version: v1alpha1
 
-clustermonitoring.config.openshift.io:
+clustermonitorings.config.openshift.io:
   Annotations:
     description: Cluster Monitoring Operators configuration API
   ApprovedPRNumber: https://github.com/openshift/api/pull/1929
-  CRDName: clustermonitoring.config.openshift.io
+  CRDName: clustermonitorings.config.openshift.io
   Capability: ""
   Category: ""
   FeatureGates:
@@ -61,7 +61,7 @@ clustermonitoring.config.openshift.io:
   HasStatus: true
   KindName: ClusterMonitoring
   Labels: {}
-  PluralName: clustermonitoring
+  PluralName: clustermonitorings
   PrinterColumns: []
   Scope: Cluster
   ShortNames: null

…penshift.io/ClusterMonitoringConfig.yaml …penshift.io/ClusterMonitoringConfig.yamlconfig/v1alpha1/zz_generated.featuregated-crd-manifests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml renamed to config/v1alpha1/zz_generated.featuregated-crd-manifests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml config/v1alpha1/zz_generated.featuregated-crd-manifests/clustermonitoring.config.openshift.io/ClusterMonitoringConfig.yaml renamed to config/v1alpha1/zz_generated.featuregated-crd-manifests/clustermonitorings.config.openshift.io/ClusterMonitoringConfig.yaml

@@ -8,13 +8,13 @@ metadata:
     api.openshift.io/filename-ordering: "01"
     description: Cluster Monitoring Operators configuration API
     feature-gate.release.openshift.io/ClusterMonitoringConfig: "true"
-  name: clustermonitoring.config.openshift.io
+  name: clustermonitorings.config.openshift.io
 spec:
   group: config.openshift.io
   names:
     kind: ClusterMonitoring
     listKind: ClusterMonitoringList
-    plural: clustermonitoring
+    plural: clustermonitorings
     singular: clustermonitoring
   scope: Cluster
   versions:

…ustermonitoring-CustomNoUpgrade.crd.yaml …stermonitorings-CustomNoUpgrade.crd.yamlconfig/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml renamed to payload-manifests/crds/0000_10_config-operator_01_clustermonitorings-CustomNoUpgrade.crd.yaml config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-CustomNoUpgrade.crd.yaml renamed to payload-manifests/crds/0000_10_config-operator_01_clustermonitorings-CustomNoUpgrade.crd.yaml

@@ -8,13 +8,13 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: CustomNoUpgrade
-  name: clustermonitoring.config.openshift.io
+  name: clustermonitorings.config.openshift.io
 spec:
   group: config.openshift.io
   names:
     kind: ClusterMonitoring
     listKind: ClusterMonitoringList
-    plural: clustermonitoring
+    plural: clustermonitorings
     singular: clustermonitoring
   scope: Cluster
   versions:

…rmonitoring-DevPreviewNoUpgrade.crd.yaml …monitorings-DevPreviewNoUpgrade.crd.yamlconfig/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml renamed to payload-manifests/crds/0000_10_config-operator_01_clustermonitorings-DevPreviewNoUpgrade.crd.yaml config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clustermonitoring-DevPreviewNoUpgrade.crd.yaml renamed to payload-manifests/crds/0000_10_config-operator_01_clustermonitorings-DevPreviewNoUpgrade.crd.yaml

@@ -8,13 +8,13 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-set: DevPreviewNoUpgrade
-  name: clustermonitoring.config.openshift.io
+  name: clustermonitorings.config.openshift.io
 spec:
   group: config.openshift.io
   names:
     kind: ClusterMonitoring
     listKind: ClusterMonitoringList
-    plural: clustermonitoring
+    plural: clustermonitorings
     singular: clustermonitoring
   scope: Cluster
   versions: