Merge pull request #10 from ibuildthecloud/work

Work

apis/cluster.cattle.io/v1/zz_generated_cluster_controller.go

@@ -19,7 +19,7 @@ var (
 		Kind:    "Cluster",
 	}
 	ClusterResource = metav1.APIResource{
-		Name:         "",
+		Name:         "clusters",
 		SingularName: "cluster",
 		Namespaced:   false,
 		Kind:         ClusterGroupVersionKind.Kind,

apis/cluster.cattle.io/v1/zz_generated_cluster_node_controller.go

@@ -19,7 +19,7 @@ var (
 		Kind:    "ClusterNode",
 	}
 	ClusterNodeResource = metav1.APIResource{
-		Name:         "",
+		Name:         "clusternodes",
 		SingularName: "clusternode",
 		Namespaced:   false,
 		Kind:         ClusterNodeGroupVersionKind.Kind,

vendor.conf

@@ -3,4 +3,4 @@ github.com/rancher/types
 
 k8s.io/kubernetes v1.8.3 transitive=true,staging=true
 bitbucket.org/ww/goautoneg a547fc61f48d567d5b4ec6f8aee5573d8efce11d https://github.com/rancher/goautoneg.git
-github.com/rancher/norman 69589bf00bfd81f9baa3b2d1ec6cccbe26bc7499
+github.com/rancher/norman cad01ba487d6c071911c619babc45ae80c252229

vendor/github.com/rancher/norman/generator/generator.go

@@ -138,10 +138,6 @@ func generateController(outputDir string, schema *types.Schema, schemas *types.S
 		return err
 	}
 
-	if schema.InternalSchema != nil {
-		schema = schema.InternalSchema
-	}
-
 	return typeTemplate.Execute(output, map[string]interface{}{
 		"schema":          schema,
 		"structFields":    getTypeMap(schema, schemas),