Skip to content

Commit

Permalink
Merge pull request #267 from mfojtik/quota-nullable
Browse files Browse the repository at this point in the history
quota: make namespaces and labelselector optional and nullable
  • Loading branch information
openshift-merge-robot authored Mar 28, 2019
2 parents ad6339a + 7da723d commit 6a2df10
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions quota/v1/generated.proto

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

6 changes: 6 additions & 0 deletions quota/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,13 @@ type ClusterResourceQuotaSpec struct {
// the project must match both restrictions.
type ClusterResourceQuotaSelector struct {
// LabelSelector is used to select projects by label.
// +optional
// +nullable
LabelSelector *metav1.LabelSelector `json:"labels" protobuf:"bytes,1,opt,name=labels"`

// AnnotationSelector is used to select projects by annotation.
// +optional
// +nullable
AnnotationSelector map[string]string `json:"annotations" protobuf:"bytes,2,rep,name=annotations"`
}

Expand All @@ -54,6 +58,8 @@ type ClusterResourceQuotaStatus struct {
// Namespaces slices the usage by project. This division allows for quick resolution of
// deletion reconciliation inside of a single project without requiring a recalculation
// across all projects. This can be used to pull the deltas for a given project.
// +optional
// +nullable
Namespaces ResourceQuotasStatusByNamespace `json:"namespaces" protobuf:"bytes,2,rep,name=namespaces"`
}

Expand Down

0 comments on commit 6a2df10

Please sign in to comment.