github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 13:50:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix incorrect reference to name in v1beta3 API.

Browse Source
This commit is contained in:
Daniel Smith
2015-04-03 14:10:47 -07:00
parent 0c2d3ffe68
commit 34b399ca02
11 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/registry/controller/rest.go
View File

@@ -75,9 +75,9 @@ func (rcStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) field
}
// ControllerToSelectableFields returns a label set that represents the object.
func ControllerToSelectableFields(controller *api.ReplicationController) labels.Set {
return labels.Set{
"name": controller.Name,
func ControllerToSelectableFields(controller *api.ReplicationController) fields.Set {
return fields.Set{
"metadata.name": controller.Name,
"status.replicas": strconv.Itoa(controller.Status.Replicas),
}
}
@@ -86,13 +86,15 @@ func ControllerToSelectableFields(controller *api.ReplicationController) labels.
// watch events from etcd to clients of the apiserver only interested in specific
// labels/fields.
func MatchController(label labels.Selector, field fields.Selector) generic.Matcher {
return generic.MatcherFunc(
func(obj runtime.Object) (bool, error) {
controllerObj, ok := obj.(*api.ReplicationController)
return &generic.SelectionPredicate{
Label: label,
Field: field,
GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) {
rc, ok := obj.(*api.ReplicationController)
if !ok {
return false, fmt.Errorf("Given object is not a replication controller.")
return nil, nil, fmt.Errorf("Given object is not a replication controller.")
}
fields := ControllerToSelectableFields(controllerObj)
return label.Matches(labels.Set(controllerObj.Labels)) && field.Matches(fields), nil
})
return labels.Set(rc.ObjectMeta.Labels), ControllerToSelectableFields(rc), nil
},
}
}