upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-03-05 15:02:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Sort dependent RBAC role and binding kinds

Browse source 
During installation and uninstallation, handle the RBAC-related
ClusterRole, ClusterRoleBinding, Role, and RoleBinding kinds in an
order that respects their potential referential integrity, namely that
ClusterRoleBindings can refer to ClusterRoles and ServiceAccounts, and
RoleBindings can refer to ClusterRoles, Roles, and ServiceAccounts.

Fixes #2199.
This commit is contained in:
Steven E. Harris 2017-03-29 17:31:21 -04:00
parent b7af2e21e4
commit 7ccfc6d7d4
2 changed files with 94 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
pkg/tiller/kind_sorter.go
View file

@ -23,11 +23,47 @@ import (
// SortOrder is an ordering of Kinds.
type SortOrder []string
// InstallOrder is the order in which manifests should be installed (by Kind)
var InstallOrder SortOrder = []string{"Namespace", "Secret", "ConfigMap", "PersistentVolume", "PersistentVolumeClaim", "ServiceAccount", "Service", "Pod", "ReplicationController", "Deployment", "DaemonSet", "Ingress", "Job"}
// InstallOrder is the order in which manifests should be installed (by Kind).
var InstallOrder SortOrder = []string{
"Namespace",
"Secret",
"ConfigMap",
"PersistentVolume",
"PersistentVolumeClaim",
"ServiceAccount",
"ClusterRole",
"ClusterRoleBinding",
"Role",
"RoleBinding",
"Service",
"Pod",
"ReplicationController",
"Deployment",
"DaemonSet",
"Ingress",
"Job",
}
// UninstallOrder is the order in which manifests should be uninstalled (by Kind)
var UninstallOrder SortOrder = []string{"Service", "Pod", "ReplicationController", "Deployment", "DaemonSet", "ConfigMap", "Secret", "PersistentVolumeClaim", "PersistentVolume", "ServiceAccount", "Ingress", "Job", "Namespace"}
// UninstallOrder is the order in which manifests should be uninstalled (by Kind).
var UninstallOrder SortOrder = []string{
"Service",
"Pod",
"ReplicationController",
"Deployment",
"DaemonSet",
"ConfigMap",
"Secret",
"PersistentVolumeClaim",
"PersistentVolume",
"RoleBinding",
"Role",
"ClusterRoleBinding",
"ClusterRole",
"ServiceAccount",
"Ingress",
"Job",
"Namespace",
}
// sortByKind does an in-place sort of manifests by Kind.
//

78
pkg/tiller/kind_sorter_test.go
View file

@ -17,6 +17,7 @@ limitations under the License.
package tiller
import (
"bytes"
"testing"
util "k8s.io/helm/pkg/releaseutil"
@ -27,48 +28,77 @@ func TestKindSorter(t *testing.T) {
{
name: "m",
content: "",
head: &util.SimpleHead{Kind: "Deployment"},
head: &util.SimpleHead{Kind: "ClusterRole"},
},
{
name: "l",
name: " ",
content: "",
head: &util.SimpleHead{Kind: "Service"},
head: &util.SimpleHead{Kind: "ClusterRoleBinding"},
},
{
name: "e",
content: "",
head: &util.SimpleHead{Kind: "ConfigMap"},
},
{
name: "k",
content: "",
head: &util.SimpleHead{Kind: "Deployment"},
},
{
name: "!",
content: "",
head: &util.SimpleHead{Kind: "HonkyTonkSet"},
},
{
name: "s",
content: "",
head: &util.SimpleHead{Kind: "Job"},
},
{
name: "h",
content: "",
head: &util.SimpleHead{Kind: "Namespace"},
},
{
name: "e",
name: "w",
content: "",
head: &util.SimpleHead{Kind: "ConfigMap"},
head: &util.SimpleHead{Kind: "Role"},
},
{
name: "o",
content: "",
head: &util.SimpleHead{Kind: "RoleBinding"},
},
{
name: "r",
content: "",
head: &util.SimpleHead{Kind: "Service"},
},
{
name: "l",
content: "",
head: &util.SimpleHead{Kind: "ServiceAccount"},
},
}
res := sortByKind(manifests, InstallOrder)
got := ""
expect := "helm!"
for _, r := range res {
got += r.name
for _, test := range []struct {
description string
order SortOrder
expected string
}{
{"install", InstallOrder, "helm works!"},
{"uninstall", UninstallOrder, "rkeow mlsh!"},
} {
var buf bytes.Buffer
t.Run(test.description, func(t *testing.T) {
defer buf.Reset()
for _, r := range sortByKind(manifests, test.order) {
buf.WriteString(r.name)
}
if got := buf.String(); got != test.expected {
t.Errorf("Expected %q, got %q", test.expected, got)
}
})
}
if got != expect {
t.Errorf("Expected %q, got %q", expect, got)
}
expect = "lmeh!"
got = ""
res = sortByKind(manifests, UninstallOrder)
for _, r := range res {
got += r.name
}
if got != expect {
t.Errorf("Expected %q, got %q", expect, got)
}
}