Merge pull request #3019 from thomastaylor312/fix/crd_ordering

fix(tiller): Adds CRD ordering

pkg/tiller/kind_sorter.go

@@ -36,6 +36,7 @@ var InstallOrder SortOrder = []string{
 	"PersistentVolume",
 	"PersistentVolumeClaim",
 	"ServiceAccount",
+	"CustomResourceDefinition",
 	"ClusterRole",
 	"ClusterRoleBinding",
 	"Role",
@@ -72,6 +73,7 @@ var UninstallOrder SortOrder = []string{
 	"Role",
 	"ClusterRoleBinding",
 	"ClusterRole",
+	"CustomResourceDefinition",
 	"ServiceAccount",
 	"PersistentVolumeClaim",
 	"PersistentVolume",

pkg/tiller/kind_sorter_test.go

@@ -41,6 +41,10 @@ func TestKindSorter(t *testing.T) {
 			Name: "u",
 			Head: &util.SimpleHead{Kind: "CronJob"},
 		},
+		{
+			Name: "2",
+			Head: &util.SimpleHead{Kind: "CustomResourceDefinition"},
+		},
 		{
 			Name: "n",
 			Head: &util.SimpleHead{Kind: "DaemonSet"},
@@ -49,10 +53,6 @@ func TestKindSorter(t *testing.T) {
 			Name: "r",
 			Head: &util.SimpleHead{Kind: "Deployment"},
 		},
-		{
-			Name: "1",
-			Head: &util.SimpleHead{Kind: "StorageClass"},
-		},
 		{
 			Name: "!",
 			Head: &util.SimpleHead{Kind: "HonkyTonkSet"},
@@ -121,6 +121,10 @@ func TestKindSorter(t *testing.T) {
 			Name: "s",
 			Head: &util.SimpleHead{Kind: "StatefulSet"},
 		},
+		{
+			Name: "1",
+			Head: &util.SimpleHead{Kind: "StorageClass"},
+		},
 		{
 			Name: "w",
 			Head: &util.SimpleHead{Kind: "APIService"},
@@ -132,8 +136,8 @@ func TestKindSorter(t *testing.T) {
 		order       SortOrder
 		expected    string
 	}{
-		{"install", InstallOrder, "abcde1fghijklmnopqrstuvw!"},
-		{"uninstall", UninstallOrder, "wvmutsrqponlkjihgf1edcba!"},
+		{"install", InstallOrder, "abcde1fgh2ijklmnopqrstuvw!"},
+		{"uninstall", UninstallOrder, "wvmutsrqponlkji2hgf1edcba!"},
 	} {
 		var buf bytes.Buffer
 		t.Run(test.description, func(t *testing.T) {