github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27275 from nebril/issue-27274

Browse Source 
Automatic merge from submit-queue

Replace map[string]string with labels.Set (TODO)

fixes #27274
This commit is contained in:
Kubernetes Submit Queue 2016-08-17 16:08:13 -07:00 committed by GitHub
commit 9ecee38f78
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/types.go
View File

@ -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

1
pkg/api/v1/generated.proto
View File

@ -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

1
pkg/api/v1/types.go
View File

@ -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