Merge pull request #2796 from zaneb/crq-crd-load-order

OCPBUGS-81627: Load ClusterResourceQuota CRD before CVO manifests

Author: openshift-merge-bot[bot]

hack/update-payload-crds.sh

@@ -9,7 +9,7 @@ crd_globs="\
     machine/v1/zz_generated.crd-manifests/*.crd*yaml\
     operator/v1/zz_generated.crd-manifests//*_config-operator_*.crd*yaml\
     operator/v1alpha1/zz_generated.crd-manifests//*_config-operator_*.crd*yaml\
-    quota/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
+    quota/v1/zz_generated.crd-manifests/*.crd.yaml\
     security/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
     securityinternal/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml
     operator/v1/zz_generated.crd-manifests/0000_50_authentication_01_authentications*.crd.yaml

…erator_01_clusterresourcequotas.crd.yaml …server_01_clusterresourcequotas.crd.yamlpayload-manifests/crds/0000_03_config-operator_01_clusterresourcequotas.crd.yaml renamed to payload-manifests/crds/0000_00_apiserver_01_clusterresourcequotas.crd.yaml payload-manifests/crds/0000_03_config-operator_01_clusterresourcequotas.crd.yaml renamed to payload-manifests/crds/0000_00_apiserver_01_clusterresourcequotas.crd.yaml

@@ -17,7 +17,7 @@ import (
 // +kubebuilder:resource:path=clusterresourcequotas,scope=Cluster
 // +kubebuilder:subresource:status
 // +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/470
-// +openshift:file-pattern=cvoRunLevel=0000_03,operatorName=config-operator,operatorOrdering=01
+// +openshift:file-pattern=cvoRunLevel=0000_00,operatorName=apiserver,operatorOrdering=01
 // +openshift:compatibility-gen:level=1
 // +kubebuilder:metadata:annotations=release.openshift.io/bootstrap-required=true
 type ClusterResourceQuota struct {

quota/v1/generated.proto

@@ -6,9 +6,9 @@ clusterresourcequotas.quota.openshift.io:
   Capability: ""
   Category: ""
   FeatureGates: []
-  FilenameOperatorName: config-operator
+  FilenameOperatorName: apiserver
   FilenameOperatorOrdering: "01"
-  FilenameRunLevel: "0000_03"
+  FilenameRunLevel: "0000_00"
   GroupName: quota.openshift.io
   HasStatus: true
   KindName: ClusterResourceQuota

quota/v1/types.go

@@ -3,8 +3,8 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/470
-    api.openshift.io/filename-cvo-runlevel: "0000_03"
-    api.openshift.io/filename-operator: config-operator
+    api.openshift.io/filename-cvo-runlevel: "0000_00"
+    api.openshift.io/filename-operator: apiserver
     api.openshift.io/filename-ordering: "01"
     feature-gate.release.openshift.io/: "true"
     release.openshift.io/bootstrap-required: "true"