Change quota status api

Signed-off-by: Imtiaz Uddin <[email protected]>
kmodules · Oct 5, 2023 · 8fae3a8 · 8fae3a8
1 parent 55c8c0d
commit 8fae3a8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 75 deletions.
diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/management/v1alpha1/openapi_generated.go b/apis/management/v1alpha1/openapi_generated.go
diff --git a/apis/management/v1alpha1/projectquota_types.go b/apis/management/v1alpha1/projectquota_types.go
@@ -65,18 +65,15 @@ type ProjectQuotaStatus struct {
 
 type ResourceQuotaStatus struct {
 	ResourceQuotaSpec `json:",inline"`
-	QuotaStatus       QuotaStatus `json:"quotaStatus"`
+	Result            QuotaResult `json:"result"`
+	// +optional
+	Reason string `json:"reason"`
 
 	// Used is the current observed total usage of the resource in the namespace.
 	// +optional
 	Used core.ResourceList `json:"used,omitempty"`
 }
 
-type QuotaStatus struct {
-	Result QuotaResult `json:"result"`
-	Reason string      `json:"reason,omitempty"`
-}
-
 // +kubebuilder:validation:Enum=Success;Error
 type QuotaResult string
 

diff --git a/apis/management/v1alpha1/zz_generated.deepcopy.go b/apis/management/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/meta/v1alpha1/zz_generated.deepcopy.go b/apis/meta/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/ui/v1alpha1/zz_generated.deepcopy.go b/apis/ui/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/management.k8s.appscode.com_projectquotas.yaml b/crds/management.k8s.appscode.com_projectquotas.yaml
@@ -81,18 +81,13 @@ spec:
                       type: object
                     kind:
                       type: string
-                    quotaStatus:
-                      properties:
-                        reason:
-                          type: string
-                        result:
-                          enum:
-                          - Success
-                          - Error
-                          type: string
-                      required:
-                      - result
-                      type: object
+                    reason:
+                      type: string
+                    result:
+                      enum:
+                      - Success
+                      - Error
+                      type: string
                     used:
                       additionalProperties:
                         anyOf:
@@ -104,7 +99,7 @@ spec:
                         resource in the namespace.
                       type: object
                   required:
-                  - quotaStatus
+                  - result
                   type: object
                 type: array
             required: