Skip to content

OCPBUGS-81627: Load ClusterResourceQuota CRD before CVO manifests #2796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zaneb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-81627: Load ClusterResourceQuota CRD before CVO manifests #2796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/update-payload-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...perator_01_clusterresourcequotas.crd.yaml → ...iserver_01_clusterresourcequotas.crd.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion quota/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion quota/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...perator_01_clusterresourcequotas.crd.yaml → ...iserver_01_clusterresourcequotas.crd.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions quota/v1/zz_generated.featuregated-crd-manifests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...ated.featuregated-crd-manifests/clusterresourcequotas.quota.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down