upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-21 22:27:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #7355 from dastrobu/#7159-cannot-install-service-account-token-due-to-install-order

Browse source 
fix(helm): move ServiceAccount before Secret in InstallOrder.
This commit is contained in:
Matthew Fisher 2020-01-08 10:04:33 -08:00 committed by GitHub
commit 7432fdc9ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/releaseutil/kind_sorter.go
View file

@ -31,12 +31,12 @@ var InstallOrder KindSortOrder = []string{
"LimitRange",
"PodSecurityPolicy",
"PodDisruptionBudget",
"ServiceAccount",
"Secret",
"ConfigMap",
"StorageClass",
"PersistentVolume",
"PersistentVolumeClaim",
"ServiceAccount",
"CustomResourceDefinition",
"ClusterRole",
"ClusterRoleList",
@ -85,12 +85,12 @@ var UninstallOrder KindSortOrder = []string{
"ClusterRoleList",
"ClusterRole",
"CustomResourceDefinition",
"ServiceAccount",
"PersistentVolumeClaim",
"PersistentVolume",
"StorageClass",
"ConfigMap",
"Secret",
"ServiceAccount",
"PodDisruptionBudget",
"PodSecurityPolicy",
"LimitRange",

14
pkg/releaseutil/kind_sorter_test.go
View file

@ -40,7 +40,7 @@ func TestKindSorter(t *testing.T) {
Head: &SimpleHead{Kind: "ClusterRoleBindingList"},
},
{
Name: "e",
Name: "f",
Head: &SimpleHead{Kind: "ConfigMap"},
},
{
@ -84,11 +84,11 @@ func TestKindSorter(t *testing.T) {
Head: &SimpleHead{Kind: "NetworkPolicy"},
},
{
Name: "f",
Name: "g",
Head: &SimpleHead{Kind: "PersistentVolume"},
},
{
Name: "g",
Name: "h",
Head: &SimpleHead{Kind: "PersistentVolumeClaim"},
},
{
@ -132,7 +132,7 @@ func TestKindSorter(t *testing.T) {
Head: &SimpleHead{Kind: "RoleBindingList"},
},
{
Name: "d",
Name: "e",
Head: &SimpleHead{Kind: "Secret"},
},
{
@ -140,7 +140,7 @@ func TestKindSorter(t *testing.T) {
Head: &SimpleHead{Kind: "Service"},
},
{
Name: "h",
Name: "d",
Head: &SimpleHead{Kind: "ServiceAccount"},
},
{
@ -166,8 +166,8 @@ func TestKindSorter(t *testing.T) {
order KindSortOrder
expected string
}{
{"install", InstallOrder, "aAbcC3de1fgh2iIjJkKlLmnopqrxstuvw!"},
{"uninstall", UninstallOrder, "wvmutsxrqponLlKkJjIi2hgf1ed3CcbAa!"},
{"install", InstallOrder, "aAbcC3def1gh2iIjJkKlLmnopqrxstuvw!"},
{"uninstall", UninstallOrder, "wvmutsxrqponLlKkJjIi2hg1fed3CcbAa!"},
} {
var buf bytes.Buffer
t.Run(test.description, func(t *testing.T) {