Merge pull request #1116 from ibuildthecloud/master

Add more ObjectClusterName implementations

apis/management.cattle.io/v3/machine_types.go

@@ -65,6 +65,10 @@ type Node struct {
 	Status NodeStatus `json:"status"`
 }
 
+func (in *Node) ObjClusterName() string {
+	return in.Namespace
+}
+
 type MetadataUpdate struct {
 	Labels      MapDelta `json:"labels,omitempty"`
 	Annotations MapDelta `json:"annotations,omitempty"`

apis/project.cattle.io/v3/app_types.go

@@ -18,6 +18,10 @@ type App struct {
 	Status AppStatus `json:"status,omitempty"`
 }
 
+func (a *App) ObjClusterName() string {
+	return a.Spec.ObjClusterName()
+}
+
 type AppSpec struct {
 	ProjectName         string            `json:"projectName,omitempty" norman:"type=reference[/v3/schemas/project]"`
 	Description         string            `json:"description,omitempty"`