From df5744ad8fb59f2af5fd0f70d5a9de39ffbdca64 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Fri, 13 Mar 2015 14:45:48 -0400
Subject: [PATCH] ResourceQuota should have labels in v1beta1 and v1beta2

---
 pkg/api/v1beta1/conversion.go | 6 ++++++
 pkg/api/v1beta1/types.go      | 1 +
 pkg/api/v1beta2/conversion.go | 6 ++++++
 pkg/api/v1beta2/types.go      | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkg/api/v1beta1/conversion.go b/pkg/api/v1beta1/conversion.go
index ff7a50e56d8..e1122a260af 100644
--- a/pkg/api/v1beta1/conversion.go
+++ b/pkg/api/v1beta1/conversion.go
@@ -848,6 +848,9 @@ func init() {
 			if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil {
+				return err
+			}
 			return nil
 		},
 		func(in *ResourceQuota, out *newer.ResourceQuota, s conversion.Scope) error {
@@ -863,6 +866,9 @@ func init() {
 			if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Labels, &out.ObjectMeta.Labels, 0); err != nil {
+				return err
+			}
 			return nil
 		},
 
diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go
index 0fe8cd65b24..c037f92f6a8 100644
--- a/pkg/api/v1beta1/types.go
+++ b/pkg/api/v1beta1/types.go
@@ -1147,6 +1147,7 @@ type ResourceQuotaStatus struct {
 // ResourceQuota sets aggregate quota restrictions enforced per namespace
 type ResourceQuota struct {
 	TypeMeta `json:",inline"`
+	Labels   map[string]string `json:"labels,omitempty" description:"map of string keys and values that can be used to organize and categorize resource quotas"`
 
 	// Spec defines the desired quota
 	Spec ResourceQuotaSpec `json:"spec,omitempty" description:"spec defines the desired quota"`
diff --git a/pkg/api/v1beta2/conversion.go b/pkg/api/v1beta2/conversion.go
index e763b235e61..99305b6d894 100644
--- a/pkg/api/v1beta2/conversion.go
+++ b/pkg/api/v1beta2/conversion.go
@@ -768,6 +768,9 @@ func init() {
 			if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Labels, &out.Labels, 0); err != nil {
+				return err
+			}
 			return nil
 		},
 		func(in *ResourceQuota, out *newer.ResourceQuota, s conversion.Scope) error {
@@ -783,6 +786,9 @@ func init() {
 			if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
 				return err
 			}
+			if err := s.Convert(&in.Labels, &out.ObjectMeta.Labels, 0); err != nil {
+				return err
+			}
 			return nil
 		},
 
diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go
index bee5487f30d..90f89d3a529 100644
--- a/pkg/api/v1beta2/types.go
+++ b/pkg/api/v1beta2/types.go
@@ -1209,7 +1209,7 @@ type ResourceQuotaStatus struct {
 // ResourceQuota sets aggregate quota restrictions enforced per namespace
 type ResourceQuota struct {
 	TypeMeta `json:",inline"`
-
+	Labels   map[string]string `json:"labels,omitempty" description:"map of string keys and values that can be used to organize and categorize resource quotas"`
 	// Spec defines the desired quota
 	Spec ResourceQuotaSpec `json:"spec,omitempty" description:"spec defines the desired quota"`