Merge pull request #204 from ibuildthecloud/master

Random

pkg/changeset/changeset.go

@@ -52,7 +52,7 @@ func watch(name string, enq Enqueuer, resolve Resolver, genericController contro
 
 		ro, ok := obj.(runtime.Object)
 		if !ok {
-			return nil
+			ro = nil
 		}
 
 		keys, err := resolve(ns, name, ro)

types/convert/merge/merge.go

@@ -9,7 +9,7 @@ import (
 )
 
 func APIUpdateMerge(schema *types.Schema, schemas *types.Schemas, dest, src map[string]interface{}, replace bool) map[string]interface{} {
-	result := mergeMaps("", nil, schema, schemas, replace, dest, src)
+	result := UpdateMerge(schema, schemas, dest, src, replace)
 	if s, ok := dest["status"]; ok {
 		result["status"] = s
 	}
@@ -19,6 +19,10 @@ func APIUpdateMerge(schema *types.Schema, schemas *types.Schemas, dest, src map[
 	return result
 }
 
+func UpdateMerge(schema *types.Schema, schemas *types.Schemas, dest, src map[string]interface{}, replace bool) map[string]interface{} {
+	return mergeMaps("", nil, schema, schemas, replace, dest, src)
+}
+
 func isProtected(k string) bool {
 	if !strings.Contains(k, "cattle.io/") || (isField(k) && k != "field.cattle.io/creatorId") {
 		return false

types/types.go

@@ -68,6 +68,17 @@ type Resource struct {
 	Actions map[string]string `json:"actions"`
 }
 
+type NamedResource struct {
+	Resource
+	Name        string `json:"name"`
+	Description string `json:"description"`
+}
+
+type NamedResourceCollection struct {
+	Collection
+	Data []NamedResource `json:"data,omitempty"`
+}
+
 type APIVersion struct {
 	Group            string `json:"group,omitempty"`
 	Version          string `json:"version,omitempty"`