Merge pull request #27275 from nebril/issue-27274

pkg/api/types.go

@@ -130,7 +130,6 @@ type ObjectMeta struct {
 	// The prefix is optional.  If the prefix is not specified, the key is assumed to be private
 	// to the user.  Other system components that wish to use labels must specify a prefix.  The
 	// "kubernetes.io/" prefix is reserved for use by kubernetes components.
-	// TODO: replace map[string]string with labels.LabelSet type
 	Labels map[string]string `json:"labels,omitempty"`
 
 	// Annotations are unstructured key value data stored with a resource that may be set by

pkg/api/v1/generated.proto

@@ -1479,7 +1479,6 @@ message ObjectMeta {
   // (scope and select) objects. May match selectors of replication controllers
   // and services.
   // More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md
-  // TODO: replace map[string]string with labels.LabelSet type
   map<string, string> labels = 11;
 
   // Annotations is an unstructured key value map stored with a resource that may be

pkg/api/v1/types.go

@@ -167,7 +167,6 @@ type ObjectMeta struct {
 	// (scope and select) objects. May match selectors of replication controllers
 	// and services.
 	// More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md
-	// TODO: replace map[string]string with labels.LabelSet type
 	Labels map[string]string `json:"labels,omitempty" protobuf:"bytes,11,rep,name=labels"`
 
 	// Annotations is an unstructured key value map stored with a resource that may be