Merge pull request #2203 from seh/sort-more-kinds-for-installation

Add more object kinds to sorted installation order

pkg/tiller/kind_sorter.go

@@ -24,8 +24,12 @@ import (
 type SortOrder []string
 
 // InstallOrder is the order in which manifests should be installed (by Kind).
+//
+// Those occurring earlier in the list get installed before those occurring later in the list.
 var InstallOrder SortOrder = []string{
 	"Namespace",
+	"ResourceQuota",
+	"LimitRange",
 	"Secret",
 	"ConfigMap",
 	"PersistentVolume",
@@ -36,32 +40,42 @@ var InstallOrder SortOrder = []string{
 	"Role",
 	"RoleBinding",
 	"Service",
+	"DaemonSet",
 	"Pod",
 	"ReplicationController",
+	"ReplicaSet",
 	"Deployment",
-	"DaemonSet",
+	"StatefulSet",
-	"Ingress",
 	"Job",
+	"CronJob",
+	"Ingress",
 }
 
 // UninstallOrder is the order in which manifests should be uninstalled (by Kind).
+//
+// Those occurring earlier in the list get uninstalled before those occurring later in the list.
 var UninstallOrder SortOrder = []string{
+	"Ingress",
 	"Service",
-	"Pod",
+	"CronJob",
-	"ReplicationController",
+	"Job",
+	"StatefulSet",
 	"Deployment",
+	"ReplicaSet",
+	"ReplicationController",
+	"Pod",
 	"DaemonSet",
-	"ConfigMap",
-	"Secret",
-	"PersistentVolumeClaim",
-	"PersistentVolume",
 	"RoleBinding",
 	"Role",
 	"ClusterRoleBinding",
 	"ClusterRole",
 	"ServiceAccount",
-	"Ingress",
+	"PersistentVolumeClaim",
-	"Job",
+	"PersistentVolume",
+	"ConfigMap",
+	"Secret",
+	"LimitRange",
+	"ResourceQuota",
 	"Namespace",
 }
 

pkg/tiller/kind_sorter_test.go

@@ -26,12 +26,12 @@ import (
 func TestKindSorter(t *testing.T) {
 	manifests := []manifest{
 		{
-			name:    "m",
+			name:    "i",
 			content: "",
 			head:    &util.SimpleHead{Kind: "ClusterRole"},
 		},
 		{
-			name:    " ",
+			name:    "j",
 			content: "",
 			head:    &util.SimpleHead{Kind: "ClusterRoleBinding"},
 		},
@@ -41,7 +41,17 @@ func TestKindSorter(t *testing.T) {
 			head:    &util.SimpleHead{Kind: "ConfigMap"},
 		},
 		{
-			name:    "k",
+			name:    "u",
+			content: "",
+			head:    &util.SimpleHead{Kind: "CronJob"},
+		},
+		{
+			name:    "n",
+			content: "",
+			head:    &util.SimpleHead{Kind: "DaemonSet"},
+		},
+		{
+			name:    "r",
 			content: "",
 			head:    &util.SimpleHead{Kind: "Deployment"},
 		},
@@ -51,35 +61,85 @@ func TestKindSorter(t *testing.T) {
 			head:    &util.SimpleHead{Kind: "HonkyTonkSet"},
 		},
 		{
-			name:    "s",
+			name:    "v",
+			content: "",
+			head:    &util.SimpleHead{Kind: "Ingress"},
+		},
+		{
+			name:    "t",
 			content: "",
 			head:    &util.SimpleHead{Kind: "Job"},
 		},
 		{
-			name:    "h",
+			name:    "c",
+			content: "",
+			head:    &util.SimpleHead{Kind: "LimitRange"},
+		},
+		{
+			name:    "a",
 			content: "",
 			head:    &util.SimpleHead{Kind: "Namespace"},
 		},
 		{
-			name:    "w",
+			name:    "f",
 			content: "",
-			head:    &util.SimpleHead{Kind: "Role"},
+			head:    &util.SimpleHead{Kind: "PersistentVolume"},
+		},
+		{
+			name:    "g",
+			content: "",
+			head:    &util.SimpleHead{Kind: "PersistentVolumeClaim"},
 		},
 		{
 			name:    "o",
 			content: "",
+			head:    &util.SimpleHead{Kind: "Pod"},
+		},
+		{
+			name:    "q",
+			content: "",
+			head:    &util.SimpleHead{Kind: "ReplicaSet"},
+		},
+		{
+			name:    "p",
+			content: "",
+			head:    &util.SimpleHead{Kind: "ReplicationController"},
+		},
+		{
+			name:    "b",
+			content: "",
+			head:    &util.SimpleHead{Kind: "ResourceQuota"},
+		},
+		{
+			name:    "k",
+			content: "",
+			head:    &util.SimpleHead{Kind: "Role"},
+		},
+		{
+			name:    "l",
+			content: "",
 			head:    &util.SimpleHead{Kind: "RoleBinding"},
 		},
 		{
-			name:    "r",
+			name:    "d",
+			content: "",
+			head:    &util.SimpleHead{Kind: "Secret"},
+		},
+		{
+			name:    "m",
 			content: "",
 			head:    &util.SimpleHead{Kind: "Service"},
 		},
 		{
-			name:    "l",
+			name:    "h",
 			content: "",
 			head:    &util.SimpleHead{Kind: "ServiceAccount"},
 		},
+		{
+			name:    "s",
+			content: "",
+			head:    &util.SimpleHead{Kind: "StatefulSet"},
+		},
 	}
 
 	for _, test := range []struct {
@@ -87,11 +147,14 @@ func TestKindSorter(t *testing.T) {
 		order       SortOrder
 		expected    string
 	}{
-		{"install", InstallOrder, "helm works!"},
+		{"install", InstallOrder, "abcdefghijklmnopqrstuv!"},
-		{"uninstall", UninstallOrder, "rkeow mlsh!"},
+		{"uninstall", UninstallOrder, "vmutsrqponlkjihgfedcba!"},
 	} {
 		var buf bytes.Buffer
 		t.Run(test.description, func(t *testing.T) {
+			if got, want := len(test.expected), len(manifests); got != want {
+				t.Fatalf("Expected %d names in order, got %d", want, got)
+			}
 			defer buf.Reset()
 			for _, r := range sortByKind(manifests, test.order) {
 				buf.WriteString(r.name)