Merge pull request #2223 from tylerslaton/no-omitempty-resources

Don't set omitempty for fields in the Resources struct

Author: tylerslaton

pkg/apis/internal.admin.acorn.io/v1/baseresources.go

@@ -10,15 +10,15 @@ import (
 // BaseResources defines resources that should be tracked at any scoped. The two main exclusions
 // currently are Secrets and Projects as they have situations they should be not be tracked.
 type BaseResources struct {
-	Apps       int `json:"apps,omitempty"`
-	Containers int `json:"containers,omitempty"`
-	Jobs       int `json:"jobs,omitempty"`
-	Volumes    int `json:"volumes,omitempty"`
-	Images     int `json:"images,omitempty"`
-
-	VolumeStorage resource.Quantity `json:"volumeStorage,omitempty"`
-	Memory        resource.Quantity `json:"memory,omitempty"`
-	CPU           resource.Quantity `json:"cpu,omitempty"`
+	Apps       int `json:"apps"`
+	Containers int `json:"containers"`
+	Jobs       int `json:"jobs"`
+	Volumes    int `json:"volumes"`
+	Images     int `json:"images"`
+
+	VolumeStorage resource.Quantity `json:"volumeStorage"`
+	Memory        resource.Quantity `json:"memory"`
+	CPU           resource.Quantity `json:"cpu"`
 }
 
 // Add will add the BaseResources of another BaseResources struct into the current one.

pkg/apis/internal.admin.acorn.io/v1/quotarequests.go

@@ -77,7 +77,7 @@ type QuotaRequestInstanceList struct {
 // QuotaRequestResources defines resources that should can be created by an AppInstance.
 type QuotaRequestResources struct {
 	BaseResources `json:",inline"`
-	Secrets       int `json:"secrets,omitempty"`
+	Secrets       int `json:"secrets"`
 }
 
 // Add will add the QuotaRequestResources of another QuotaRequestResources struct into the current one.