Merge pull request #3899 from Serg1i/feat/kindSorter-add-PodSecurityPolicy

Create PodSecurityPolicy before Pods and ServiceAccounts

pkg/tiller/kind_sorter.go

@@ -30,6 +30,7 @@ var InstallOrder SortOrder = []string{
 	"Namespace",
 	"ResourceQuota",
 	"LimitRange",
+	"PodSecurityPolicy",
 	"Secret",
 	"ConfigMap",
 	"StorageClass",
@@ -80,6 +81,7 @@ var UninstallOrder SortOrder = []string{
 	"StorageClass",
 	"ConfigMap",
 	"Secret",
+	"PodSecurityPolicy",
 	"LimitRange",
 	"ResourceQuota",
 	"Namespace",

pkg/tiller/kind_sorter_test.go

@@ -85,6 +85,10 @@ func TestKindSorter(t *testing.T) {
 			Name: "o",
 			Head: &util.SimpleHead{Kind: "Pod"},
 		},
+		{
+			Name: "3",
+			Head: &util.SimpleHead{Kind: "PodSecurityPolicy"},
+		},
 		{
 			Name: "q",
 			Head: &util.SimpleHead{Kind: "ReplicaSet"},
@@ -136,8 +140,8 @@ func TestKindSorter(t *testing.T) {
 		order       SortOrder
 		expected    string
 	}{
-		{"install", InstallOrder, "abcde1fgh2ijklmnopqrstuvw!"},
+		{"install", InstallOrder, "abc3de1fgh2ijklmnopqrstuvw!"},
-		{"uninstall", UninstallOrder, "wvmutsrqponlkji2hgf1edcba!"},
+		{"uninstall", UninstallOrder, "wvmutsrqponlkji2hgf1ed3cba!"},
 	} {
 		var buf bytes.Buffer
 		t.Run(test.description, func(t *testing.T) {