Merge pull request #76 from carmark/watch

add 'network' watch selector('metadata.name')

Author: feiskyer

pkg/api/v1/conversion.go

@@ -200,6 +200,20 @@ func addConversionFuncs(scheme *runtime.Scheme) {
 		// If one of the conversion functions is malformed, detect it immediately.
 		panic(err)
 	}
+	err = api.Scheme.AddFieldLabelConversionFunc("v1", "Network",
+		func(label, value string) (string, string, error) {
+			switch label {
+			case "metadata.name",
+				"status.phase":
+				return label, value, nil
+			default:
+				return "", "", fmt.Errorf("field label not supported: %s", label)
+			}
+		})
+	if err != nil {
+		// If one of the conversion functions is malformed, detect it immediately.
+		panic(err)
+	}
 }
 
 func Convert_api_ReplicationControllerSpec_To_v1_ReplicationControllerSpec(in *api.ReplicationControllerSpec, out *ReplicationControllerSpec, s conversion.Scope) error {

pkg/registry/network/rest.go

@@ -119,7 +119,7 @@ func MatchNetwork(label labels.Selector, field fields.Selector) generic.Matcher
 // NetworkToSelectableFields returns a label set that represents the object
 func NetworkToSelectableFields(network *api.Network) labels.Set {
 	return labels.Set{
-		"name":         network.Name,
-		"status.phase": string(network.Status.Phase),
+		"metadata.name": network.Name,
+		"status.phase":  string(network.Status.Phase),
 	}
 }